Fix initial hiding and centering cursor on Ozone

ash/display/display_controller.h

Index: ash/display/display_controller.h
diff --git a/ash/display/display_controller.h b/ash/display/display_controller.h
index 73822e859b3e15881478404a6b7cc5120ac0e5a7..d9b2d6342ebe8496bd1d436baa4dd7af8cebdae9 100644
--- a/ash/display/display_controller.h
+++ b/ash/display/display_controller.h
@@ -211,10 +211,16 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver,
   scoped_ptr<CursorWindowController> cursor_window_controller_;
   scoped_ptr<MirrorWindowController> mirror_window_controller_;
 
-  // Stores the curent cursor location (in native coordinates) used to
-  // restore the cursor location when display configuration
-  // changed.
+  // Stores the current cursor location (in native coordinates and screen
+  // coordinates respectively). The locations are used to restore the cursor
+  // location when the display configuration changes and to determine whether
+  // the mouse should be moved after a display configuration change.
   gfx::Point cursor_location_in_native_coords_for_restore_;
+  gfx::Point cursor_location_in_screen_coords_for_restore_;
+
+  // Stores the cursor's display. The id is used to determine whether the mouse
+  // should be moved after a display configuration change.
+  int64 cursor_display_id_for_restore_;
 
   base::WeakPtrFactory<DisplayController> weak_ptr_factory_;