diff options
| author | oshima <oshima@chromium.org> | 2015-08-05 17:23:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-06 00:24:05 +0000 |
| commit | f10ce77c4a171dfc111db65e0b7dde5331f835eb (patch) | |
| tree | e20f2c12c555f4d9bdb98011952395731c99a768 /ash | |
| parent | f946f7f9d1e91104ee6df3b5060ff9bccc2b3117 (diff) | |
| download | chromium_src-f10ce77c4a171dfc111db65e0b7dde5331f835eb.zip chromium_src-f10ce77c4a171dfc111db65e0b7dde5331f835eb.tar.gz chromium_src-f10ce77c4a171dfc111db65e0b7dde5331f835eb.tar.bz2 | |
Do not update te cursor when the mirroring display is set to software cursor.
BUG=517222
Review URL: https://codereview.chromium.org/1274903002
Cr-Commit-Position: refs/heads/master@{#342023}
Diffstat (limited to 'ash')
| -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() |