PlatformScreenOzone using DisplayManager

ui/display/manager/display_manager.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 "ui/display/manager/display_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <map>
@@ skipping 118 matching lines @@
 using std::vector;
 
 // static
 int64_t DisplayManager::kUnifiedDisplayId = -10;
 
 DisplayManager::DisplayManager(std::unique_ptr<Screen> screen)
     : screen_(std::move(screen)),
       layout_store_(new DisplayLayoutStore),
       weak_ptr_factory_(this) {
 #if defined(OS_CHROMEOS)
-  change_display_upon_host_resize_ = !base::SysInfo::IsRunningOnChromeOS();
+  configure_displays_ = base::SysInfo::IsRunningOnChromeOS();
+  change_display_upon_host_resize_ = !configure_displays_;
   unified_desktop_enabled_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
       ::switches::kEnableUnifiedDesktop);
 #endif
 }
 
 DisplayManager::~DisplayManager() {
 #if defined(OS_CHROMEOS)
   // Reset the font params.
   gfx::SetFontRenderParamsDeviceScaleFactor(1.0f);
 #endif
@@ skipping 223 matching lines @@
     }
     display_info_list.push_back(info);
   }
   if (display_property_changed) {
     AddMirrorDisplayInfoIfAny(&display_info_list);
     UpdateDisplaysWith(display_info_list);
   }
   if (resolution_changed && IsInUnifiedMode()) {
     ReconfigureDisplays();
 #if defined(OS_CHROMEOS)
-  } else if (resolution_changed && base::SysInfo::IsRunningOnChromeOS()) {
+  } else if (resolution_changed && configure_displays_) {
     delegate_->display_configurator()->OnConfigurationChanged();
 #endif
   }
   return resolution_changed || display_property_changed;
 }
 
 void DisplayManager::RegisterDisplayProperty(
     int64_t display_id,
     Display::Rotation rotation,
     float ui_scale,
@@ skipping 93 matching lines @@
 void DisplayManager::SetColorCalibrationProfile(
     int64_t display_id,
     ui::ColorCalibrationProfile profile) {
 #if defined(OS_CHROMEOS)
   if (!display_info_[display_id].IsColorProfileAvailable(profile))
     return;
 
   if (delegate_)
     delegate_->PreDisplayConfigurationChange(false);
   // Just sets color profile if it's not running on ChromeOS (like tests).
-  if (!base::SysInfo::IsRunningOnChromeOS() ||
+  if (!configure_displays_ ||
       delegate_->display_configurator()->SetColorCalibrationProfile(display_id,
                                                                     profile)) {
     display_info_[display_id].SetColorProfile(profile);
     UMA_HISTOGRAM_ENUMERATION("ChromeOS.Display.ColorProfile", profile,
                               ui::NUM_COLOR_PROFILES);
   }
   if (delegate_)
     delegate_->PostDisplayConfigurationChange(false);
 #endif
 }
@@ skipping 89 matching lines @@
       // active again.
       Display::Rotation user_rotation =
           display_info_[Display::InternalDisplayId()].GetRotation(
               Display::ROTATION_SOURCE_USER);
       display_info_[Display::InternalDisplayId()].SetRotation(
           user_rotation, Display::ROTATION_SOURCE_USER);
     }
   }
 
 #if defined(OS_CHROMEOS)
-  if (!base::SysInfo::IsRunningOnChromeOS() &&
-      new_display_info_list.size() > 1) {
+  if (!configure_displays_ && new_display_info_list.size() > 1) {
     DisplayIdList list = GenerateDisplayIdList(
         new_display_info_list.begin(), new_display_info_list.end(),
         [](const ManagedDisplayInfo& info) { return info.id(); });
 
     const DisplayLayout& layout =
         layout_store_->GetRegisteredDisplayLayout(list);
     // Mirror mode is set by DisplayConfigurator on the device.
     // Emulate it when running on linux desktop.
     if (layout.mirrored)
       SetMultiDisplayMode(MIRRORING);
@@ skipping 301 matching lines @@
   return Display::HasInternalDisplay() ? Display::InternalDisplayId()
                                        : kInvalidDisplayId;
 }
 
 void DisplayManager::SetMirrorMode(bool mirror) {
   // TODO(oshima): Enable mirror mode for 2> displays. crbug.com/589319.
   if (num_connected_displays() != 2)
     return;
 
 #if defined(OS_CHROMEOS)
-  if (base::SysInfo::IsRunningOnChromeOS()) {
+  if (configure_displays_) {
     ui::MultipleDisplayState new_state =
         mirror ? ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR
                : ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED;
     delegate_->display_configurator()->SetDisplayMode(new_state);
     return;
   }
 #endif
   multi_display_mode_ =
       mirror ? MIRRORING : current_default_multi_display_mode_;
   ReconfigureDisplays();
@@ skipping 495 matching lines @@
 }
 
 const Display& DisplayManager::GetSecondaryDisplay() const {
   CHECK_LE(2U, GetNumDisplays());
   return GetDisplayAt(0).id() == Screen::GetScreen()->GetPrimaryDisplay().id()
              ? GetDisplayAt(1)
              : GetDisplayAt(0);
 }
 
 }  // namespace display