aura: Remove --aura-disable-hold-mouse-moves flag.

This has been on by default for almost 3 months. Minor code clean-up to remove it.

BUG=none
TEST=none


Review URL: https://chromiumcodereview.appspot.com/10536033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140824 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 5 insertions, 16 deletions

diff --git a/ui/aura/aura_switches.cc b/ui/aura/aura_switches.cc
index 7a0a764..ebddb66 100644
--- a/ui/aura/aura_switches.cc
+++ b/ui/aura/aura_switches.cc
@@ -8,9 +8,6 @@
 
 namespace switches {
 
-// Enable the holding of mouse movements in order to throttle window resizing.
-const char kAuraDisableHoldMouseMoves[] = "aura-disable-hold-mouse-moves";
-
 // If set gesture events do not generate mouse events.
 const char kAuraDisableMouseEventsFromTouch[] =
     "aura-disable-mouse-events-from-touch";
diff --git a/ui/aura/aura_switches.h b/ui/aura/aura_switches.h
index d78e27a..b72ff85 100644
--- a/ui/aura/aura_switches.h
+++ b/ui/aura/aura_switches.h
@@ -11,7 +11,6 @@
 namespace switches {
 
 // Please keep alphabetized.
-AURA_EXPORT extern const char kAuraDisableHoldMouseMoves[];
 AURA_EXPORT extern const char kAuraDisableMouseEventsFromTouch[];
 AURA_EXPORT extern const char kAuraHostWindowSize[];
 AURA_EXPORT extern const char kAuraHostWindowUseFullscreen[];
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index 0538c6f..b941669 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -130,13 +130,10 @@ RootWindow::RootWindow(const gfx::Rect& initial_bounds)
       draw_on_compositing_end_(false),
       defer_draw_scheduling_(false),
       mouse_move_hold_count_(0),
-      should_hold_mouse_moves_(false),
       compositor_lock_(NULL),
       draw_on_compositor_unlock_(false),
       draw_trace_count_(0) {
   SetName("RootWindow");
-  should_hold_mouse_moves_ = !CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kAuraDisableHoldMouseMoves);
 
   compositor_.reset(new ui::Compositor(this, host_->GetAcceleratedWidget()));
   DCHECK(compositor_.get());
@@ -520,17 +517,14 @@ void RootWindow::ToggleFullScreen() {
 #endif
 
 void RootWindow::HoldMouseMoves() {
-  if (should_hold_mouse_moves_)
-    ++mouse_move_hold_count_;
+  ++mouse_move_hold_count_;
 }
 
 void RootWindow::ReleaseMouseMoves() {
-  if (should_hold_mouse_moves_) {
-    --mouse_move_hold_count_;
-    DCHECK_GE(mouse_move_hold_count_, 0);
-    if (!mouse_move_hold_count_)
-      DispatchHeldMouseMove();
-  }
+  --mouse_move_hold_count_;
+  DCHECK_GE(mouse_move_hold_count_, 0);
+  if (!mouse_move_hold_count_)
+    DispatchHeldMouseMove();
 }
 
 scoped_refptr<CompositorLock> RootWindow::GetCompositorLock() {
diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h
index b5f02cf..d3f7830 100644
--- a/ui/aura/root_window.h
+++ b/ui/aura/root_window.h
@@ -399,7 +399,6 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
   // How many holds are outstanding. We try to defer dispatching mouse moves
   // while the count is > 0.
   int mouse_move_hold_count_;
-  bool should_hold_mouse_moves_;
   scoped_ptr<MouseEvent> held_mouse_move_;
 
   CompositorLock* compositor_lock_;