MD Settings: Display: Add unified desktop control and modify api

chrome/browser/extensions/display_info_provider_chromeos.cc

 // Copyright 2014 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/extensions/display_info_provider_chromeos.h"
 
 #include <stdint.h>
 
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/display/display_configuration_controller.h"
@@ skipping 223 matching lines @@
 // error message.
 bool ValidateParamsForDisplay(const system_display::DisplayProperties& info,
                               const display::Display& display,
                               display::DisplayManager* display_manager,
                               int64_t primary_display_id,
                               std::string* error) {
   int64_t id = display.id();
   bool is_primary =
       id == primary_display_id || (info.is_primary && *info.is_primary);
 
+  if (info.is_unified) {
+    if (!is_primary) {
+      *error = "Unified desktop mode can only be set for the primary display.";
+      return false;
+    }
+    if (info.mirroring_source_id) {
+      *error = "Unified desktop mode can not be set with mirroringSourceId.";

[malaykeshav, 2017/04/11 17:29:12]

What does this error mean? 
It cannot be set when displays are mirrored?

[stevenjb, 2017/04/11 17:34:38]

We disallow setting both 'is_unified' and 'mirroring_source_id' at the same
time. (|info| is a dictionary of scoped_ptr, so testing info.mirroring_source_id
tests the *presence* of the property, not the value).

In theory we could allow this value to be empty if is_unified is true, or
anything if *info.is_unified is false (and vice versa), but it's simpler just to
require that only one value or the other be set at a time, rather than duplicate
the model logic here.

+      return false;
+    }
+    return true;
+  }
+
   // If mirroring source id is set, a display with the given id should exist,
   // and if should not be the same as the target display's id.
   if (info.mirroring_source_id && !info.mirroring_source_id->empty()) {
     int64_t mirroring_id = GetDisplay(*info.mirroring_source_id).id();
     if (mirroring_id == display::kInvalidDisplayId) {
       *error = "Display " + *info.mirroring_source_id + " not found.";
       return false;
     }
 
     if (*info.mirroring_source_id == base::Int64ToString(id)) {
@@ skipping 198 matching lines @@
 bool DisplayInfoProviderChromeOS::SetInfo(
     const std::string& display_id_str,
     const system_display::DisplayProperties& info,
     std::string* error) {
   if (ash_util::IsRunningInMash()) {
     // TODO(crbug.com/682402): Mash support.
     NOTIMPLEMENTED();
     *error = "Not implemented for mash.";
     return false;
   }
+
   display::DisplayManager* display_manager =
       ash::Shell::GetInstance()->display_manager();
   ash::DisplayConfigurationController* display_configuration_controller =
       ash::Shell::GetInstance()->display_configuration_controller();
 
   const display::Display target = GetDisplay(display_id_str);
 
   if (target.id() == display::kInvalidDisplayId) {
     *error = "Display not found:" + display_id_str;
     return false;
   }
 
   int64_t display_id = target.id();
   const display::Display& primary =
       display::Screen::GetScreen()->GetPrimaryDisplay();
 
   if (!ValidateParamsForDisplay(info, target, display_manager, primary.id(),
                                 error)) {
     return false;
   }
 
+  // Process 'isUnified' parameter if set.
+  if (info.is_unified) {
+    display_manager->SetDefaultMultiDisplayModeForCurrentDisplays(
+        *info.is_unified ? display::DisplayManager::UNIFIED
+                         : display::DisplayManager::EXTENDED);
+  }
+
   // Process 'isPrimary' parameter.
   if (info.is_primary && *info.is_primary && target.id() != primary.id())
     display_configuration_controller->SetPrimaryDisplayId(display_id);
 
   // Process 'mirroringSourceId' parameter.
   if (info.mirroring_source_id) {
     bool mirror = !info.mirroring_source_id->empty();
     display_configuration_controller->SetMirrorMode(mirror);
   }
 
@@ skipping 124 matching lines @@
   if (ash_util::IsRunningInMash()) {
     // TODO(crbug.com/682402): Mash support.
     NOTIMPLEMENTED();
     return;
   }
   ash::Shell::GetInstance()->display_manager()->SetUnifiedDesktopEnabled(
       enable);
 }
 
 DisplayInfoProvider::DisplayUnitInfoList
-DisplayInfoProviderChromeOS::GetAllDisplaysInfo() {
+DisplayInfoProviderChromeOS::GetAllDisplaysInfo(bool single_unified) {
   if (ash_util::IsRunningInMash()) {
     // TODO(crbug.com/682402): Mash support.
     NOTIMPLEMENTED();
     return DisplayInfoProvider::DisplayUnitInfoList();
   }
   display::DisplayManager* display_manager =
       ash::Shell::GetInstance()->display_manager();
+
   if (!display_manager->IsInUnifiedMode())
-    return DisplayInfoProvider::GetAllDisplaysInfo();
+    return DisplayInfoProvider::GetAllDisplaysInfo(single_unified);
 
-  std::vector<display::Display> displays =
-      display_manager->software_mirroring_display_list();
-  CHECK_GT(displays.size(), 0u);
+  // Chrome OS specific: get displays for unified mode.
+  std::vector<display::Display> displays;
+  int64_t primary_id;
+  if (single_unified) {
+    for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i)
+      displays.push_back(display_manager->GetDisplayAt(i));
+    primary_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
+  } else {
+    displays = display_manager->software_mirroring_display_list();
+    CHECK_GT(displays.size(), 0u);
+    // Use first display as primary.
+    primary_id = displays[0].id();
+  }
 
-  // Use first display as primary.
-  int64_t primary_id = displays[0].id();
   DisplayUnitInfoList all_displays;
   for (const display::Display& display : displays) {
-    system_display::DisplayUnitInfo unit =
+    system_display::DisplayUnitInfo unit_info =
         CreateDisplayUnitInfo(display, primary_id);
-    UpdateDisplayUnitInfoForPlatform(display, &unit);
-    all_displays.push_back(std::move(unit));
+    UpdateDisplayUnitInfoForPlatform(display, &unit_info);
+    unit_info.is_unified = true;
+    all_displays.push_back(std::move(unit_info));
   }
   return all_displays;
 }
 
 DisplayInfoProvider::DisplayLayoutList
 DisplayInfoProviderChromeOS::GetDisplayLayout() {
   if (ash_util::IsRunningInMash()) {
     // TODO(crbug.com/682402): Mash support.
     NOTIMPLEMENTED();
     return DisplayInfoProvider::DisplayLayoutList();
@@ skipping 236 matching lines @@
     touch_calibrator_.reset(new chromeos::TouchCalibratorController);
   return touch_calibrator_.get();
 }
 
 // static
 DisplayInfoProvider* DisplayInfoProvider::Create() {
   return new DisplayInfoProviderChromeOS();
 }
 
 }  // namespace extensions