diff options
Diffstat (limited to 'ash/display/cursor_window_controller.cc')
| -rw-r--r-- | ash/display/cursor_window_controller.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ash/display/cursor_window_controller.cc b/ash/display/cursor_window_controller.cc index 633652c..9e30dec 100644 --- a/ash/display/cursor_window_controller.cc +++ b/ash/display/cursor_window_controller.cc @@ -4,6 +4,7 @@ #include "ash/display/cursor_window_controller.h" +#include "ash/display/display_manager.h" #include "ash/display/mirror_window_controller.h" #include "ash/display/window_tree_host_manager.h" #include "ash/root_window_controller.h" @@ -138,6 +139,13 @@ void CursorWindowController::SetDisplay(const gfx::Display& display) { if (!is_cursor_compositing_enabled_) return; + // TODO(oshima): Do not updatethe composition cursor when crossing + // display in unified desktop mode for now. crbug.com/517222. + if (Shell::GetInstance()->display_manager()->IsInUnifiedMode() && + display.id() != DisplayManager::kUnifiedDisplayId) { + return; + } + display_ = display; aura::Window* root_window = Shell::GetInstance() ->window_tree_host_manager() |