Index: ash/display/display_controller.cc |
diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc |
index 7b7cc5882e5592a336e718a28d2fa3c442bb5215..f337d23feac25e160a4e5e20660a5b70d3b5fdd8 100644 |
--- a/ash/display/display_controller.cc |
+++ b/ash/display/display_controller.cc |
@@ -9,6 +9,7 @@ |
#include <map> |
#include "ash/ash_switches.h" |
+#include "ash/display/cursor_window_controller.h" |
#include "ash/display/display_layout_store.h" |
#include "ash/display/display_manager.h" |
#include "ash/display/mirror_window_controller.h" |
@@ -216,6 +217,7 @@ bool DisplayController::DisplayChangeLimiter::IsThrottled() const { |
DisplayController::DisplayController() |
: primary_root_window_for_replace_(NULL), |
focus_activation_store_(new internal::FocusActivationStore()), |
+ cursor_window_controller_(new internal::CursorWindowController(false)), |
mirror_window_controller_(new internal::MirrorWindowController), |
virtual_keyboard_window_controller_( |
new internal::VirtualKeyboardWindowController) { |
@@ -249,6 +251,7 @@ void DisplayController::Shutdown() { |
// DisplayManager outlives DisplayController. |
Shell::GetInstance()->display_manager()->set_delegate(NULL); |
+ cursor_window_controller_.reset(); |
mirror_window_controller_.reset(); |
virtual_keyboard_window_controller_.reset(); |
@@ -400,6 +403,10 @@ void DisplayController::SwapPrimaryDisplay() { |
} |
} |
+void DisplayController::EnableCompositedCursor(aura::Window* container) { |
+ cursor_window_controller_->InitCursorWindow(container); |
+} |
+ |
void DisplayController::SetPrimaryDisplayId(int64 id) { |
DCHECK_NE(gfx::Display::kInvalidDisplayID, id); |
if (id == gfx::Display::kInvalidDisplayID || primary_display_id == id) |