Allow dynamic enabling/disabling of unified desktop

chrome/browser/ui/webui/options/chromeos/display_options_handler.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 "chrome/browser/ui/webui/options/chromeos/display_options_handler.h"
 
 #include <string>
 
-#include "ash/ash_switches.h"
 #include "ash/display/display_configurator_animation.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/resolution_notification_controller.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/rotator/screen_rotation_animator.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ skipping 304 matching lines @@
     offset_value.reset(new base::FundamentalValue(layout.offset));
   }
 
   web_ui()->CallJavascriptFunction(
       "options.DisplayOptions.setDisplayInfo",
       mode, js_displays, *layout_value.get(), *offset_value.get());
 }
 
 void DisplayOptionsHandler::UpdateDisplaySettingsEnabled() {
   bool enabled = GetDisplayManager()->num_connected_displays() <= 2;
-  bool show_unified_desktop = ash::switches::UnifiedDesktopEnabled();
+  bool show_unified_desktop = GetDisplayManager()->unified_desktop_enabled();
 
   web_ui()->CallJavascriptFunction(
       "options.BrowserOptions.enableDisplaySettings",
       base::FundamentalValue(enabled),
       base::FundamentalValue(show_unified_desktop));
 }
 
 void DisplayOptionsHandler::OnFadeOutForMirroringFinished(bool is_mirroring) {
   ash::Shell::GetInstance()->display_manager()->SetMirrorMode(is_mirroring);
   // Not necessary to start fade-in animation. DisplayConfigurator will do that.
@@ skipping 136 matching lines @@
     return;
   }
 
   GetDisplayManager()->SetColorCalibrationProfile(
       display_id, static_cast<ui::ColorCalibrationProfile>(profile_id));
   SendAllDisplayInfo();
 }
 
 void DisplayOptionsHandler::HandleSetUnifiedDesktopEnabled(
     const base::ListValue* args) {
-  DCHECK(ash::switches::UnifiedDesktopEnabled());
+  DCHECK(GetDisplayManager()->unified_desktop_enabled());
   bool enable = false;
   if (args->GetBoolean(0, &enable)) {
-    GetDisplayManager()->SetDefaultMultiDisplayMode(
+    GetDisplayManager()->SetDefaultMultiDisplayModeForCurrentDisplays(
         enable ? DisplayManager::UNIFIED : DisplayManager::EXTENDED);
     GetDisplayManager()->ReconfigureDisplays();
   }
 }
 
 }  // namespace options
 }  // namespace chromeos