Allow dynamic enabling/disabling of unified desktop

ash/root_window_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/root_window_controller.h"
 
 #include <queue>
 #include <vector>
 
 #include "ash/ash_constants.h"
@@ skipping 155 matching lines @@
   };
   const int kExtraContainerIdsToMoveInUnifiedMode[] = {
       kShellWindowId_LockScreenContainer,
       kShellWindowId_LockScreenBackgroundContainer,
   };
   std::vector<int> container_ids(
       kContainerIdsToMove,
       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);
   }
 
   for (int id : container_ids) {
     aura::Window* src_container = Shell::GetContainer(src, id);
     aura::Window* dst_container = Shell::GetContainer(dst, id);
     while (!src_container->children().empty()) {
       // Restart iteration from the source container windows each time as they
       // may change as a result of moving other windows.
@@ skipping 870 matching lines @@
   else
     DisableTouchHudProjection();
 }
 
 RootWindowController* GetRootWindowController(
     const aura::Window* root_window) {
   return root_window ? GetRootWindowSettings(root_window)->controller : NULL;
 }
 
 }  // namespace ash