Renamed OutputConfigurator to DisplayConfigurator

ash/display/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 "ash/display/display_manager.h"
 
 #include <cmath>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 437 matching lines @@
   std::vector<DisplayMode>::const_iterator iter =
       std::find_if(modes.begin(), modes.end(), DisplayModeMatcher(resolution));
   if (iter == modes.end()) {
     LOG(WARNING) << "Unsupported resolution was requested:"
                  << resolution.ToString();
     return;
   }
   display_modes_[display_id] = *iter;
 #if defined(OS_CHROMEOS)
   if (base::SysInfo::IsRunningOnChromeOS())
-    Shell::GetInstance()->output_configurator()->OnConfigurationChanged();
+    Shell::GetInstance()->display_configurator()->OnConfigurationChanged();
 #endif
 }
 
 void DisplayManager::RegisterDisplayProperty(
     int64 display_id,
     gfx::Display::Rotation rotation,
     float ui_scale,
     const gfx::Insets* overscan_insets,
     const gfx::Size& resolution_in_pixels,
     ui::ColorCalibrationProfile color_profile) {
@@ skipping 39 matching lines @@
     int64 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() ||
-      Shell::GetInstance()->output_configurator()->SetColorCalibrationProfile(
+      Shell::GetInstance()->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();
 #endif
 }
 
@@ skipping 330 matching lines @@
 }
 
 void DisplayManager::SetMirrorMode(bool mirrored) {
   if (num_connected_displays() <= 1)
     return;
 
 #if defined(OS_CHROMEOS)
   if (base::SysInfo::IsRunningOnChromeOS()) {
     ui::OutputState new_state = mirrored ? ui::OUTPUT_STATE_DUAL_MIRROR :
                                            ui::OUTPUT_STATE_DUAL_EXTENDED;
-    Shell::GetInstance()->output_configurator()->SetDisplayMode(new_state);
+    Shell::GetInstance()->display_configurator()->SetDisplayMode(new_state);
     return;
   }
 #endif
   // This is fallback path to emulate mirroroing on desktop.
   SetSecondDisplayMode(mirrored ? MIRRORING : EXTENDED);
   DisplayInfoList display_info_list;
   int count = 0;
   for (std::map<int64, DisplayInfo>::const_iterator iter =
            display_info_.begin();
        count < 2; ++iter, ++count) {
@@ skipping 117 matching lines @@
   }
   display_info_[new_info.id()].UpdateDisplaySize();
 
   OnDisplayInfoUpdated(display_info_[new_info.id()]);
 }
 
 void DisplayManager::OnDisplayInfoUpdated(const DisplayInfo& display_info) {
 #if defined(OS_CHROMEOS)
   ui::ColorCalibrationProfile color_profile = display_info.color_profile();
   if (color_profile != ui::COLOR_PROFILE_STANDARD) {
-    Shell::GetInstance()->output_configurator()->SetColorCalibrationProfile(
+    Shell::GetInstance()->display_configurator()->SetColorCalibrationProfile(
         display_info.id(), color_profile);
   }
 #endif
 }
 
 gfx::Display DisplayManager::CreateDisplayFromDisplayInfoById(int64 id) {
   DCHECK(display_info_.find(id) != display_info_.end());
   const DisplayInfo& display_info = display_info_[id];
 
   gfx::Display new_display(display_info.id());
@@ skipping 92 matching lines @@
       new_secondary_origin.Offset(-secondary_bounds.width(), offset);
       break;
   }
   gfx::Insets insets = secondary_display->GetWorkAreaInsets();
   secondary_display->set_bounds(
       gfx::Rect(new_secondary_origin, secondary_bounds.size()));
   secondary_display->UpdateWorkAreaFromInsets(insets);
 }
 
 }  // namespace ash