Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1754)

Unified Diff: ash/display/display_controller.h

Issue 13466022: Don't move cursor location when rotation /ui scaling has changed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add explicit bootstrap flag as display_controller is no longer NULL during bootstrap Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/display/display_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_controller.h
diff --git a/ash/display/display_controller.h b/ash/display/display_controller.h
index 9fccbffa37deca4363f16cabfcc84b73e99d7048..53130734ddd55a61b3a3c176e3e99c62de2f8264 100644
--- a/ash/display/display_controller.h
+++ b/ash/display/display_controller.h
@@ -191,6 +191,16 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver {
// Returns the display layout registered for the given display id |pair|.
DisplayLayout GetRegisteredDisplayLayout(const DisplayIdPair& pair) const;
+ // Checks if the mouse pointer is on one of displays, and moves to
+ // the center of the nearest display if it's outside of all displays.
+ void EnsurePointerInDisplays();
+
+ gfx::Point GetNativeMouseCursorLocation() const;
+
+ // Update the current cursor image that is sutable for the given
+ // |point_in_native|.
+ void UpdateMouseCursor(const gfx::Point& point_in_native);
+
// aura::DisplayObserver overrides:
virtual void OnDisplayBoundsChanged(
const gfx::Display& display) OVERRIDE;
@@ -223,6 +233,8 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver {
void OnFadeOutForSwapDisplayFinished();
+ bool in_bootstrap() const { return in_bootstrap_; }
+
class DisplayChangeLimiter {
public:
DisplayChangeLimiter();
@@ -258,6 +270,8 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver {
// display.
aura::RootWindow* primary_root_window_for_replace_;
+ bool in_bootstrap_;
+
DISALLOW_COPY_AND_ASSIGN(DisplayController);
};
« no previous file with comments | « no previous file | ash/display/display_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698