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 601 matching lines @@
         GetDisplayMode(display_manager, display_info, display_mode));
   }
 }
 
 void DisplayInfoProviderChromeOS::EnableUnifiedDesktop(bool enable) {
   if (ash_util::IsRunningInMash()) {
     // TODO(crbug.com/682402): Mash support.
     NOTIMPLEMENTED();
     return;
   }
-  ash::Shell::GetInstance()->display_manager()->SetUnifiedDesktopEnabled(
-      enable);
+  ash::Shell::GetInstance()
+      ->display_manager()
+      ->SetDefaultMultiDisplayModeForCurrentDisplays(
+          enable ? display::DisplayManager::UNIFIED
+                 : display::DisplayManager::EXTENDED);
 }
 
 DisplayInfoProvider::DisplayUnitInfoList
 DisplayInfoProviderChromeOS::GetAllDisplaysInfo() {
   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();
 
-  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;
+  for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i)
+    displays.push_back(display_manager->GetDisplayAt(i));
 
-  // Use first display as primary.
-  int64_t primary_id = displays[0].id();
+  int64_t primary_id = display::Screen::GetScreen()->GetPrimaryDisplay().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;

[xiyuan, 2017/04/05 21:41:45]

Can you document why we are doing this? I was puzzled initially then figured
that out after I saw line 638-639 that this code only runs for unified mode.

[stevenjb, 2017/04/06 01:56:08]

That was the intent of the comment at line 641 :) I'm not sure how much a
comment here will help.

+    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