| 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);
|
| };
|
|
|
|
|