Index: ui/aura/root_window.h |
diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h |
index 708fa6cefbfee9b5889dec3e30397806b0f97e5f..61eb8455d89eb2bb6a4e41ba8f4d719eb048e129 100644 |
--- a/ui/aura/root_window.h |
+++ b/ui/aura/root_window.h |
@@ -96,6 +96,7 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate, |
Window* mouse_pressed_handler() { return mouse_pressed_handler_; } |
Window* capture_window() { return capture_window_; } |
Window* focused_window() { return focused_window_; } |
+ ui::Layer* magnification_layer() { return magnification_layer_.get(); } |
// Initializes the root window. |
void Init(); |
@@ -119,6 +120,10 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate, |
// used. |
void SetCursor(gfx::NativeCursor cursor); |
+ void SetForceHideCursor(bool hide) { |
sky
2012/05/16 15:40:48
Add description
yoshiki
2012/05/17 17:19:32
Done.
|
+ force_hide_cursor_ = hide; |
sky
2012/05/16 15:40:48
SHouldn't this update the cursor immediately if th
yoshiki
2012/05/17 17:19:32
Done.
|
+ } |
+ |
// Shows or hides the cursor. |
void ShowCursor(bool show); |
@@ -349,6 +354,8 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate, |
scoped_ptr<RootWindowHost> host_; |
+ scoped_ptr<ui::Layer> magnification_layer_; |
sky
2012/05/16 15:40:48
Add description.
yoshiki
2012/05/17 17:19:32
Done.
|
+ |
// If set before the RootWindow is created, the cursor will be drawn within |
// the Aura root window but hidden outside of it, and it'll remain hidden |
// after the Aura window is closed. |
@@ -399,6 +406,8 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate, |
bool should_hold_mouse_moves_; |
scoped_ptr<MouseEvent> held_mouse_move_; |
+ bool force_hide_cursor_; |
+ |
CompositorLock* compositor_lock_; |
bool draw_on_compositor_unlock_; |