Index: ash/display/display_controller.h |
diff --git a/ash/display/display_controller.h b/ash/display/display_controller.h |
index 839e70b5651c97dbc7bc0f3f988529f5027f8c24..94c6d77c2d9512cdf20d18914f072517daea1830 100644 |
--- a/ash/display/display_controller.h |
+++ b/ash/display/display_controller.h |
@@ -38,6 +38,7 @@ class Insets; |
namespace ash { |
namespace internal { |
+class CursorWindowController; |
class DisplayInfo; |
class DisplayManager; |
class FocusActivationStore; |
@@ -76,6 +77,10 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver, |
// TODO(oshima): Move this out from DisplayController; |
static int64 GetPrimaryDisplayId(); |
+ internal::CursorWindowController* cursor_window_controller() { |
+ return cursor_window_controller_.get(); |
+ } |
+ |
internal::MirrorWindowController* mirror_window_controller() { |
return mirror_window_controller_.get(); |
} |
@@ -107,6 +112,9 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver, |
// Swap primary and secondary display. |
void SwapPrimaryDisplay(); |
+ // Enable composited cursor. The cursor is drawn in the given container. |
+ void EnableCompositedCursor(aura::Window* container); |
+ |
// Sets the ID of the primary display. If the display is not connected, it |
// will switch the primary display when connected. |
void SetPrimaryDisplayId(int64 id); |
@@ -199,6 +207,7 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver, |
scoped_ptr<internal::FocusActivationStore> focus_activation_store_; |
+ scoped_ptr<internal::CursorWindowController> cursor_window_controller_; |
scoped_ptr<internal::MirrorWindowController> mirror_window_controller_; |
scoped_ptr<internal::VirtualKeyboardWindowController> |
virtual_keyboard_window_controller_; |