Allow the cursor to warp even when a window is dragged

ash/display/display_controller.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_DISPLAY_DISPLAY_CONTROLLER_H_
 #define ASH_DISPLAY_DISPLAY_CONTROLLER_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 50 matching lines @@
 
   // Returns all oot window controllers. In non extended desktop
   // mode, this return a RootWindowController for the primary root window only.
   std::vector<internal::RootWindowController*> GetAllRootWindowControllers();
 
   SecondaryDisplayLayout secondary_display_layout() const {
     return secondary_display_layout_;
   }
   void SetSecondaryDisplayLayout(SecondaryDisplayLayout layout);
 
+  void set_allow_warp_during_lock(bool allow_warp_during_lock) {

[sky, 2012/08/03 17:07:18]

This (or the field) needs a go description as to what warp means.

[Yusuke Sato, 2012/08/03 23:18:45]

Add a detailed description to the field.

+    allow_warp_during_lock_ = allow_warp_during_lock;

[Daniel Erat, 2012/08/03 19:43:10]

nit: s/allow_warp/allow_mouse_warp/ or similar

[Yusuke Sato, 2012/08/03 23:18:45]

Done.

+  }
+
   // Warps the mouse cursor to an alternate root window when the
   // |point_in_root|, which is the location of the mouse cursor,
   // hits or exceeds the edge of the |root_window| and the mouse cursor
   // is considered to be in an alternate display. Returns true if
   // the cursor was moved.
   bool WarpMouseCursorIfNecessary(aura::RootWindow* root_window,
-                                  const gfx::Point& point_in_root);
+                                  const gfx::Point& point_in_root,
+                                  bool is_cursor_locked);
 
   // aura::DisplayObserver overrides:
   virtual void OnDisplayBoundsChanged(
       const gfx::Display& display) OVERRIDE;
   virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE;
   virtual void OnDisplayRemoved(const gfx::Display& display) OVERRIDE;
 
   // Is extended desktop enabled?
   static bool IsExtendedDesktopEnabled();
 
  private:
   // Creates a root window for |display| and stores it in the |root_windows_|
   // map.
   aura::RootWindow* AddRootWindowForDisplay(const gfx::Display& display);
 
   void UpdateDisplayBoundsForLayout();
 
   std::map<int, aura::RootWindow*> root_windows_;
 
   SecondaryDisplayLayout secondary_display_layout_;
 
+  // If true, the cursor can warp even when it's locked.

[Daniel Erat, 2012/08/03 19:43:10]

I'd prefer that we used "cursor" to refer just to the specific appearance of the
cursor (e.g. arrow, hand, etc.) and something like "pointer" or "mouse" to refer
to its location.  We're already completely inconsistent here: see
aura::RootWindow::GetLastMouseLocationInRoot(), QueryMouseLocationForTest(),
and... MoveCursorTo(). :-(

[Yusuke Sato, 2012/08/03 23:18:45]

Fixed the comment. I'll rename MoveCursorTo if necessary (in another CL).

+  bool allow_warp_during_lock_;
+
   DISALLOW_COPY_AND_ASSIGN(DisplayController);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_CONTROLLER_H_