diff options
| author | oshima <oshima@chromium.org> | 2015-07-31 18:33:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-01 01:34:05 +0000 |
| commit | 628a617979598ad6ade68cc7f48815477a2f903a (patch) | |
| tree | c2ff77b8cc668c6afa400c7f714f6b4f7764daa6 /ash/root_window_controller.cc | |
| parent | 47d6636cd48907043fd615a51dc00af379db19fe (diff) | |
| download | chromium_src-628a617979598ad6ade68cc7f48815477a2f903a.zip chromium_src-628a617979598ad6ade68cc7f48815477a2f903a.tar.gz chromium_src-628a617979598ad6ade68cc7f48815477a2f903a.tar.bz2 | |
Allow dynamic enabling/disabling of unified desktop
The default multi display is stored in the layout store first, and which is used by UpdateDisplays later.
Hence no need to update this layout information in
WindowTreeHostManager. current_default_multi_display_mode_ is still necessary because it's also used when switching to/from mirror mode.
This also fixed a bug in the logic to short ids.
BUG=515607
TEST=covered by unittests. manual
Review URL: https://codereview.chromium.org/1261693004
Cr-Commit-Position: refs/heads/master@{#341452}
Diffstat (limited to 'ash/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 1953fed..97fd09e 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -173,8 +173,9 @@ void ReparentAllWindows(aura::Window* src, aura::Window* dst) { kContainerIdsToMove + arraysize(kContainerIdsToMove)); // Check the default_multi_display_mode because this is also necessary // in trasition between mirror <-> unified mode. - if (Shell::GetInstance()->display_manager()->default_multi_display_mode() == - DisplayManager::UNIFIED) { + if (Shell::GetInstance() + ->display_manager() + ->current_default_multi_display_mode() == DisplayManager::UNIFIED) { for (int id : kExtraContainerIdsToMoveInUnifiedMode) container_ids.push_back(id); } |