Renamed OutputConfigurator to DisplayConfigurator

ash/display/display_change_observer_chromeos.cc

 // Copyright 2013 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_change_observer_chromeos.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/display/chromeos/display_mode.h"
 #include "ui/display/chromeos/display_snapshot.h"
 #include "ui/gfx/display.h"
 
 namespace ash {
 
-using ui::OutputConfigurator;
+using ui::DisplayConfigurator;
 
 namespace {
 
 // The DPI threshold to detect high density screen.
 // Higher DPI than this will use device_scale_factor=2.
 const unsigned int kHighDensityDPIThreshold = 170;
 
 // 1 inch in mm.
 const float kInchInMm = 25.4f;
 
 // Display mode list is sorted by (in descending priority):
 //  * the area in pixels.
 //  * refresh rate.
 struct DisplayModeSorter {
   bool operator()(const DisplayMode& a, const DisplayMode& b) {
     if (a.size.GetArea() == b.size.GetArea())
       return (a.refresh_rate > b.refresh_rate);
     return (a.size.GetArea() > b.size.GetArea());
   }
 };
 
 }  // namespace
 
 // static
 std::vector<DisplayMode> DisplayChangeObserver::GetDisplayModeList(
-    const OutputConfigurator::DisplayState& output) {
+    const DisplayConfigurator::DisplayState& output) {
   typedef std::map<std::pair<int, int>, DisplayMode> DisplayModeMap;
   DisplayModeMap display_mode_map;
 
   for (std::vector<const ui::DisplayMode*>::const_iterator it =
            output.display->modes().begin();
        it != output.display->modes().end();
        ++it) {
     const ui::DisplayMode& mode_info = **it;
     const std::pair<int, int> size(mode_info.size().width(),
                                    mode_info.size().height());
@@ skipping 45 matching lines @@
   DisplayMode mode;
   if (!Shell::GetInstance()->display_manager()->GetSelectedModeForDisplayId(
            display_id, &mode))
     return false;
 
   *size = mode.size;
   return true;
 }
 
 void DisplayChangeObserver::OnDisplayModeChanged(
-    const std::vector<OutputConfigurator::DisplayState>& outputs) {
+    const std::vector<DisplayConfigurator::DisplayState>& outputs) {
   std::vector<DisplayInfo> displays;
   std::set<int64> ids;
   for (size_t i = 0; i < outputs.size(); ++i) {
-    const OutputConfigurator::DisplayState& output = outputs[i];
+    const DisplayConfigurator::DisplayState& output = outputs[i];
 
     if (output.display->type() == ui::OUTPUT_TYPE_INTERNAL &&
         gfx::Display::InternalDisplayId() == gfx::Display::kInvalidDisplayID) {
       gfx::Display::SetInternalDisplayId(output.display->display_id());
     }
 
     const ui::DisplayMode* mode_info = output.display->current_mode();
     if (!mode_info)
       continue;
 
@@ skipping 23 matching lines @@
     displays.push_back(DisplayInfo(id, name, has_overscan));
     DisplayInfo& new_info = displays.back();
     new_info.set_device_scale_factor(device_scale_factor);
     new_info.SetBounds(display_bounds);
     new_info.set_native(true);
     new_info.set_display_modes(display_modes);
     new_info.set_touch_support(
         output.touch_device_id == 0 ? gfx::Display::TOUCH_SUPPORT_UNAVAILABLE :
                                       gfx::Display::TOUCH_SUPPORT_AVAILABLE);
     new_info.set_available_color_profiles(
-        Shell::GetInstance()->output_configurator()->
-        GetAvailableColorCalibrationProfiles(id));
+        Shell::GetInstance()
+            ->display_configurator()
+            ->GetAvailableColorCalibrationProfiles(id));
   }
 
   // DisplayManager can be null during the boot.
   Shell::GetInstance()->display_manager()->OnNativeDisplaysChanged(displays);
 }
 
 void DisplayChangeObserver::OnAppTerminating() {
 #if defined(USE_ASH)
   // Stop handling display configuration events once the shutdown
   // process starts. crbug.com/177014.
-  Shell::GetInstance()->output_configurator()->PrepareForExit();
+  Shell::GetInstance()->display_configurator()->PrepareForExit();
 #endif
 }
 
 }  // namespace ash