Remove unused enum, fields

BUG=None

Review URL: https://codereview.chromium.org/1082423006

Cr-Commit-Position: refs/heads/master@{#326469}

ash/display/mouse_cursor_event_filter.cc

@@ -109,9 +109,8 @@ void MovePointInside(const gfx::Rect& native_bounds,
 }  // namespace
 
 MouseCursorEventFilter::MouseCursorEventFilter()
-    : mouse_warp_mode_(WARP_ALWAYS),
+    : mouse_warp_enabled_(true),
       drag_source_root_(NULL),
-      scale_when_drag_started_(1.0f),
       shared_display_edge_indicator_(new SharedDisplayEdgeIndicator) {
   Shell::GetInstance()->display_controller()->AddObserver(this);
 }
@@ -174,14 +173,6 @@ void MouseCursorEventFilter::OnDisplayConfigurationChanged() {
 }
 
 void MouseCursorEventFilter::OnMouseEvent(ui::MouseEvent* event) {
-  aura::Window* target = static_cast<aura::Window*>(event->target());
-
-  if (event->type() == ui::ET_MOUSE_PRESSED) {
-    scale_when_drag_started_ = ui::GetDeviceScaleFactor(target->layer());
-  } else if (event->type() == ui::ET_MOUSE_RELEASED) {
-    scale_when_drag_started_ = 1.0f;
-  }
-
   // Handle both MOVED and DRAGGED events here because when the mouse pointer
   // enters the other root window while dragging, the underlying window system
   // (at least X11) stops generating a ui::ET_MOUSE_MOVED event.
@@ -246,8 +237,7 @@ bool MouseCursorEventFilter::WarpMouseCursorIfNecessary(ui::MouseEvent* event) {
 bool MouseCursorEventFilter::WarpMouseCursorInNativeCoords(
     const gfx::Point& point_in_native,
     const gfx::Point& point_in_screen) {
-  if (Shell::GetScreen()->GetNumDisplays() <= 1 ||
-      mouse_warp_mode_ == WARP_NONE)
+  if (Shell::GetScreen()->GetNumDisplays() <= 1 || !mouse_warp_enabled_)
     return false;
 
   bool in_src_edge = src_edge_bounds_in_native_.Contains(point_in_native);

ash/display/mouse_cursor_event_filter.h

@@ -26,20 +26,10 @@ class SharedDisplayEdgeIndicator;
 class ASH_EXPORT MouseCursorEventFilter : public ui::EventHandler,
                                           public DisplayController::Observer {
  public:
-  enum MouseWarpMode {
-    WARP_ALWAYS,   // Always warp the mouse when possible.
-    WARP_DRAG,     // Used when dragging a window. Top and bottom
-                   // corner of the shared edge is reserved for window
-                   // snapping.
-    WARP_NONE,     // No mouse warping. Used when resizing the window.
-  };
-
   MouseCursorEventFilter();
   ~MouseCursorEventFilter() override;
 
-  void set_mouse_warp_mode(MouseWarpMode mouse_warp_mode) {
-    mouse_warp_mode_ = mouse_warp_mode;
-  }
+  void set_mouse_warp_enabled(bool enabled) { mouse_warp_enabled_ = enabled; }
 
   // Shows/Hide the indicator for window dragging. The |from|
   // is the window where the dragging started.
@@ -88,18 +78,17 @@ class ASH_EXPORT MouseCursorEventFilter : public ui::EventHandler,
   void UpdateHorizontalEdgeBounds();
   void UpdateVerticalEdgeBounds();
 
-  // Returns the source and destination window. When the
-  // mouse_warp_mode_ is WARP_DRAG, src_window is the root window
-  // where the drag starts. When the mouse_warp_mode_ is WARP_ALWAYS,
-  // the src_window is always the primary root window, because there
-  // is no difference between moving src to dst and moving dst to src.
+  // Returns the source and destination window. When |src_window| is
+  // |drag_soruce_root_| when it is set. Otherwise, the |src_window|
+  // is always the primary root window, because there is no difference
+  // between moving src to dst and moving dst to src.
   void GetSrcAndDstRootWindows(aura::Window** src_window,
                                aura::Window** dst_window);
 
   bool WarpMouseCursorIfNecessaryForTest(aura::Window* target_root,
                                          const gfx::Point& point_in_screen);
 
-  MouseWarpMode mouse_warp_mode_;
+  bool mouse_warp_enabled_;
 
   // The bounds for warp hole windows. |dst_indicator_bounds_| is kept
   // in the instance for testing.
@@ -112,8 +101,6 @@ class ASH_EXPORT MouseCursorEventFilter : public ui::EventHandler,
   // The root window in which the dragging started.
   aura::Window* drag_source_root_;
 
-  float scale_when_drag_started_;
-
   // Shows the area where a window can be dragged in to/out from
   // another display.
   scoped_ptr<SharedDisplayEdgeIndicator> shared_display_edge_indicator_;

ash/display/mouse_cursor_event_filter_unittest.cc

@@ -172,13 +172,12 @@ TEST_F(MouseCursorEventFilterTest, SetMouseWarpModeFlag) {
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   aura::Env::GetInstance()->set_last_mouse_location(gfx::Point(1, 1));
 
-  event_filter()->set_mouse_warp_mode(MouseCursorEventFilter::WARP_NONE);
+  event_filter()->set_mouse_warp_enabled(false);
   EXPECT_FALSE(WarpMouseCursorIfNecessary(root_windows[0],
                                           gfx::Point(499, 11)));
   EXPECT_EQ("1,1",
             aura::Env::GetInstance()->last_mouse_location().ToString());
-
-  event_filter()->set_mouse_warp_mode(MouseCursorEventFilter::WARP_ALWAYS);
+  event_filter()->set_mouse_warp_enabled(true);
   EXPECT_TRUE(WarpMouseCursorIfNecessary(root_windows[0], gfx::Point(499, 11)));
   EXPECT_EQ("501,11",
             aura::Env::GetInstance()->last_mouse_location().ToString());

ash/wm/drag_window_resizer.cc

@@ -57,8 +57,7 @@ DragWindowResizer::~DragWindowResizer() {
   if (window_state_)
     window_state_->DeleteDragDetails();
   Shell* shell = Shell::GetInstance();
-  shell->mouse_cursor_filter()->set_mouse_warp_mode(
-      MouseCursorEventFilter::WARP_ALWAYS);
+  shell->mouse_cursor_filter()->set_mouse_warp_enabled(true);
   shell->mouse_cursor_filter()->HideSharedEdgeIndicator();
   if (instance_ == this)
     instance_ = NULL;
@@ -156,9 +155,7 @@ DragWindowResizer::DragWindowResizer(WindowResizer* next_window_resizer,
   // window/tab to another display.
   MouseCursorEventFilter* mouse_cursor_filter =
       Shell::GetInstance()->mouse_cursor_filter();
-  mouse_cursor_filter->set_mouse_warp_mode(
-      ShouldAllowMouseWarp() ?
-      MouseCursorEventFilter::WARP_DRAG : MouseCursorEventFilter::WARP_NONE);
+  mouse_cursor_filter->set_mouse_warp_enabled(ShouldAllowMouseWarp());
   if (ShouldAllowMouseWarp())
     mouse_cursor_filter->ShowSharedEdgeIndicator(GetTarget()->GetRootWindow());
   instance_ = this;

ash/wm/drag_window_resizer_unittest.cc

@@ -427,49 +427,40 @@ TEST_F(DragWindowResizerTest, WarpMousePointer) {
   ASSERT_TRUE(event_filter);
   window_->SetBounds(gfx::Rect(0, 0, 50, 60));
 
-  EXPECT_EQ(MouseCursorEventFilter::WARP_ALWAYS,
-            event_filter->mouse_warp_mode_);
+  EXPECT_TRUE(event_filter->mouse_warp_enabled_);
   {
     scoped_ptr<WindowResizer> resizer(CreateDragWindowResizer(
         window_.get(), gfx::Point(), HTCAPTION));
     // While dragging a window, warp should be allowed.
-    EXPECT_EQ(MouseCursorEventFilter::WARP_DRAG,
-              event_filter->mouse_warp_mode_);
+    EXPECT_TRUE(event_filter->mouse_warp_enabled_);
     resizer->CompleteDrag();
   }
-  EXPECT_EQ(MouseCursorEventFilter::WARP_ALWAYS,
-            event_filter->mouse_warp_mode_);
+  EXPECT_TRUE(event_filter->mouse_warp_enabled_);
 
   {
     scoped_ptr<WindowResizer> resizer(CreateDragWindowResizer(
         window_.get(), gfx::Point(), HTCAPTION));
-    EXPECT_EQ(MouseCursorEventFilter::WARP_DRAG,
-              event_filter->mouse_warp_mode_);
+    EXPECT_TRUE(event_filter->mouse_warp_enabled_);
     resizer->RevertDrag();
   }
-  EXPECT_EQ(MouseCursorEventFilter::WARP_ALWAYS,
-            event_filter->mouse_warp_mode_);
+  EXPECT_TRUE(event_filter->mouse_warp_enabled_);
 
   {
     scoped_ptr<WindowResizer> resizer(CreateDragWindowResizer(
         window_.get(), gfx::Point(), HTRIGHT));
     // While resizing a window, warp should NOT be allowed.
-    EXPECT_EQ(MouseCursorEventFilter::WARP_NONE,
-              event_filter->mouse_warp_mode_);
+    EXPECT_FALSE(event_filter->mouse_warp_enabled_);
     resizer->CompleteDrag();
   }
-  EXPECT_EQ(MouseCursorEventFilter::WARP_ALWAYS,
-            event_filter->mouse_warp_mode_);
+  EXPECT_TRUE(event_filter->mouse_warp_enabled_);
 
   {
     scoped_ptr<WindowResizer> resizer(CreateDragWindowResizer(
         window_.get(), gfx::Point(), HTRIGHT));
-    EXPECT_EQ(MouseCursorEventFilter::WARP_NONE,
-              event_filter->mouse_warp_mode_);
+    EXPECT_FALSE(event_filter->mouse_warp_enabled_);
     resizer->RevertDrag();
   }
-  EXPECT_EQ(MouseCursorEventFilter::WARP_ALWAYS,
-            event_filter->mouse_warp_mode_);
+  EXPECT_TRUE(event_filter->mouse_warp_enabled_);
 }
 
 // Verifies cursor's device scale factor is updated whe a window is moved across