Allow switching between extended and unified

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_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/resolution_notification_controller.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 175 matching lines @@
   localized_strings->SetString("orientation180", l10n_util::GetStringUTF16(
       IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_180));
   localized_strings->SetString("orientation270", l10n_util::GetStringUTF16(
       IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_270));
   localized_strings->SetString(
       "startCalibratingOverscan", l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_START_CALIBRATING_OVERSCAN));
   localized_strings->SetString(
       "selectedDisplayColorProfile", l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_COLOR_PROFILE));
+  localized_strings->SetString(
+      "enableUnifiedDesktop",
+      l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_ENABLE_UNIFIED_DESKTOP));
 }
 
 void DisplayOptionsHandler::InitializePage() {
   DCHECK(web_ui());
   UpdateDisplaySettingsEnabled();
 }
 
 void DisplayOptionsHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback(
       "getDisplayInfo",
@@ skipping 16 matching lines @@
       base::Bind(&DisplayOptionsHandler::HandleSetDisplayMode,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "setOrientation",
       base::Bind(&DisplayOptionsHandler::HandleSetOrientation,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "setColorProfile",
       base::Bind(&DisplayOptionsHandler::HandleSetColorProfile,
                  base::Unretained(this)));
+  web_ui()->RegisterMessageCallback(
+      "setUnifiedDesktopEnabled",
+      base::Bind(&DisplayOptionsHandler::HandleSetUnifiedDesktopEnabled,
+                 base::Unretained(this)));
 }
 
 void DisplayOptionsHandler::OnDisplayConfigurationChanging() {
 }
 
 void DisplayOptionsHandler::OnDisplayConfigurationChanged() {
   UpdateDisplaySettingsEnabled();
   SendAllDisplayInfo();
 }
 
 void DisplayOptionsHandler::SendAllDisplayInfo() {
   DisplayManager* display_manager = GetDisplayManager();
 
   std::vector<gfx::Display> displays;
   for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
     displays.push_back(display_manager->GetDisplayAt(i));
   }
   SendDisplayInfo(displays);
 }
 
 void DisplayOptionsHandler::SendDisplayInfo(
     const std::vector<gfx::Display>& displays) {
   DisplayManager* display_manager = GetDisplayManager();
-  base::FundamentalValue mirroring(display_manager->IsInMirrorMode());
+  base::StringValue mode(
+      display_manager->IsInMirrorMode() ? "mirror" :
+      (display_manager->IsInUnifiedMode() ? "unified" : "extended"));

[Jun Mukai, 2015/05/20 02:47:49]

Just for safety,
if (mode == "unified") DCHECK(ash::switches::UnifiedDesktopEnabled());
?

(or setting to "mirror" or "extended" if
!ash::switches::UnifiedDesktopEnabled()) ?

[oshima, 2015/05/20 06:40:01]

This is actually guarded by ash::switch, and DCHECK beflow, so I dont' think
that's helpful.

 
   int64 primary_id = ash::Shell::GetScreen()->GetPrimaryDisplay().id();
   base::ListValue js_displays;
   for (const gfx::Display& display : displays) {
     const ash::DisplayInfo& display_info =
         display_manager->GetDisplayInfo(display.id());
     const gfx::Rect& bounds = display.bounds();
     base::DictionaryValue* js_display = new base::DictionaryValue();
     js_display->SetString("id", base::Int64ToString(display.id()));
     js_display->SetInteger("x", bounds.x());
@@ skipping 33 matching lines @@
   scoped_ptr<base::Value> offset_value = base::Value::CreateNullValue();
   if (display_manager->GetNumDisplays() > 1) {
     const ash::DisplayLayout layout =
         display_manager->GetCurrentDisplayLayout();
     layout_value.reset(new base::FundamentalValue(layout.position));
     offset_value.reset(new base::FundamentalValue(layout.offset));
   }
 
   web_ui()->CallJavascriptFunction(
       "options.DisplayOptions.setDisplayInfo",
-      mirroring, js_displays, *layout_value.get(), *offset_value.get());
+      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();
+
   web_ui()->CallJavascriptFunction(
       "options.BrowserOptions.enableDisplaySettings",
-      base::FundamentalValue(enabled));
+      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.
 }
 
 void DisplayOptionsHandler::OnFadeOutForDisplayLayoutFinished(
     int position, int offset) {
   SetCurrentDisplayLayout(
@@ skipping 129 matching lines @@
       profile_id > ui::COLOR_PROFILE_READING) {
     LOG(ERROR) << "Invalid profile_id: " << profile_id;
     return;
   }
 
   GetDisplayManager()->SetColorCalibrationProfile(
       display_id, static_cast<ui::ColorCalibrationProfile>(profile_id));
   SendAllDisplayInfo();
 }
 
+void DisplayOptionsHandler::HandleSetUnifiedDesktopEnabled(
+    const base::ListValue* args) {

[Jun Mukai, 2015/05/20 02:47:49]

Also DCHECK(ash::switches::UnifiedDesktopEnabled()) (or return if not)

[oshima, 2015/05/20 06:40:01]

Done.

+  bool enable = false;
+  if (args->GetBoolean(0, &enable)) {
+    GetDisplayManager()->SetDefaultMultiDisplayMode(
+        enable ? DisplayManager::UNIFIED : DisplayManager::EXTENDED);
+    GetDisplayManager()->ReconfigureDisplays();
+  }
+}
+
 }  // namespace options
 }  // namespace chromeos