Renamed OutputConfigurator to DisplayConfigurator

BUG=333413

Review URL: https://codereview.chromium.org/226183004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262183 0039d316-1c4b-4281-b951-d872f2087c98

apps/shell/browser/shell_desktop_controller.cc

@@ -89,10 +89,10 @@ ShellDesktopController* g_instance = NULL;
 
 ShellDesktopController::ShellDesktopController() {
 #if defined(OS_CHROMEOS)
-  output_configurator_.reset(new ui::OutputConfigurator);
-  output_configurator_->Init(false);
-  output_configurator_->ForceInitialConfigure(0);
-  output_configurator_->AddObserver(this);
+  display_configurator_.reset(new ui::DisplayConfigurator);
+  display_configurator_->Init(false);
+  display_configurator_->ForceInitialConfigure(0);
+  display_configurator_->AddObserver(this);
 #endif
   CreateRootWindow();
 
@@ -141,7 +141,7 @@ aura::WindowTreeHost* ShellDesktopController::GetWindowTreeHost() {
 
 #if defined(OS_CHROMEOS)
 void ShellDesktopController::OnDisplayModeChanged(
-    const std::vector<ui::OutputConfigurator::DisplayState>& outputs) {
+    const std::vector<ui::DisplayConfigurator::DisplayState>& outputs) {
   gfx::Size size = GetPrimaryDisplaySize();
   if (!size.IsEmpty())
     wm_test_helper_->host()->UpdateRootWindowSize(size);
@@ -177,8 +177,8 @@ void ShellDesktopController::DestroyRootWindow() {
 
 gfx::Size ShellDesktopController::GetPrimaryDisplaySize() {
 #if defined(OS_CHROMEOS)
-  const std::vector<ui::OutputConfigurator::DisplayState>& states =
-      output_configurator_->cached_outputs();
+  const std::vector<ui::DisplayConfigurator::DisplayState>& states =
+      display_configurator_->cached_outputs();
   if (states.empty())
     return gfx::Size();
   const ui::DisplayMode* mode = states[0].display->current_mode();

apps/shell/browser/shell_desktop_controller.h

@@ -12,7 +12,7 @@
 #include "ui/gfx/geometry/size.h"
 
 #if defined(OS_CHROMEOS)
-#include "ui/display/chromeos/output_configurator.h"
+#include "ui/display/chromeos/display_configurator.h"
 #endif
 
 namespace aura {
@@ -35,7 +35,7 @@ class ShellAppWindow;
 // Handles desktop-related tasks for app_shell.
 class ShellDesktopController
 #if defined(OS_CHROMEOS)
-    : public ui::OutputConfigurator::Observer
+    : public ui::DisplayConfigurator::Observer
 #endif
       {
  public:
@@ -58,10 +58,9 @@ class ShellDesktopController
   aura::WindowTreeHost* GetWindowTreeHost();
 
 #if defined(OS_CHROMEOS)
-  // ui::OutputConfigurator::Observer overrides.
-  virtual void OnDisplayModeChanged(
-      const std::vector<ui::OutputConfigurator::DisplayState>& outputs)
-      OVERRIDE;
+  // ui::DisplayConfigurator::Observer overrides.
+  virtual void OnDisplayModeChanged(const std::vector<
+      ui::DisplayConfigurator::DisplayState>& outputs) OVERRIDE;
 #endif
 
  private:
@@ -76,7 +75,7 @@ class ShellDesktopController
   gfx::Size GetPrimaryDisplaySize();
 
 #if defined(OS_CHROMEOS)
-  scoped_ptr<ui::OutputConfigurator> output_configurator_;
+  scoped_ptr<ui::DisplayConfigurator> display_configurator_;
 #endif
 
   // Enable a minimal set of views::corewm to be initialized.

ash/display/display_change_observer_chromeos.cc

@@ -26,7 +26,7 @@
 
 namespace ash {
 
-using ui::OutputConfigurator;
+using ui::DisplayConfigurator;
 
 namespace {
 
@@ -52,7 +52,7 @@ struct DisplayModeSorter {
 
 // 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;
 
@@ -118,11 +118,11 @@ bool DisplayChangeObserver::GetResolutionForDisplayId(int64 display_id,
 }
 
 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) {
@@ -164,8 +164,9 @@ void DisplayChangeObserver::OnDisplayModeChanged(
         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.
@@ -176,7 +177,7 @@ 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
 }
 

ash/display/display_change_observer_chromeos.h

@@ -8,34 +8,34 @@
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
 #include "base/basictypes.h"
-#include "ui/display/chromeos/output_configurator.h"
+#include "ui/display/chromeos/display_configurator.h"
 
 namespace ash {
 
 struct DisplayMode;
 
 // An object that observes changes in display configuration and
 // update DisplayManagers.
-class DisplayChangeObserver : public ui::OutputConfigurator::StateController,
-                              public ui::OutputConfigurator::Observer,
+class DisplayChangeObserver : public ui::DisplayConfigurator::StateController,
+                              public ui::DisplayConfigurator::Observer,
                               public ShellObserver {
  public:
   // Returns the resolution list.
   ASH_EXPORT static std::vector<DisplayMode> GetDisplayModeList(
-      const ui::OutputConfigurator::DisplayState& output);
+      const ui::DisplayConfigurator::DisplayState& output);
 
   DisplayChangeObserver();
   virtual ~DisplayChangeObserver();
 
-  // ui::OutputConfigurator::StateController overrides:
+  // ui::DisplayConfigurator::StateController overrides:
   virtual ui::OutputState GetStateForDisplayIds(
       const std::vector<int64>& outputs) const OVERRIDE;
   virtual bool GetResolutionForDisplayId(int64 display_id,
                                          gfx::Size* size) const OVERRIDE;
 
-  // Overriden from ui::OutputConfigurator::Observer:
+  // Overriden from ui::DisplayConfigurator::Observer:
   virtual void OnDisplayModeChanged(
-      const ui::OutputConfigurator::DisplayStateList& outputs) OVERRIDE;
+      const ui::DisplayConfigurator::DisplayStateList& outputs) OVERRIDE;
 
   // Overriden from ShellObserver:
   virtual void OnAppTerminating() OVERRIDE;

ash/display/display_change_observer_chromeos_unittest.cc

@@ -7,11 +7,11 @@
 #include "ash/display/display_info.h"
 #include "base/memory/scoped_vector.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/display/chromeos/display_configurator.h"
 #include "ui/display/chromeos/display_mode.h"
-#include "ui/display/chromeos/output_configurator.h"
 #include "ui/display/chromeos/test/test_display_snapshot.h"
 
-using ui::OutputConfigurator;
+using ui::DisplayConfigurator;
 
 typedef testing::Test DisplayChangeObserverTest;
 
@@ -44,7 +44,7 @@ TEST_F(DisplayChangeObserverTest, GetDisplayModeList) {
 
   ui::TestDisplaySnapshot display_snapshot;
   display_snapshot.set_modes(modes.get());
-  OutputConfigurator::DisplayState output;
+  DisplayConfigurator::DisplayState output;
   output.display = &display_snapshot;
 
   std::vector<DisplayMode> display_modes =

ash/display/display_error_observer_chromeos.h

@@ -8,19 +8,19 @@
 #include "ash/ash_export.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
-#include "ui/display/chromeos/output_configurator.h"
+#include "ui/display/chromeos/display_configurator.h"
 
 namespace ash {
 
 // The class to observe the output failures and shows the error dialog when
 // necessary.
 class ASH_EXPORT DisplayErrorObserver
-    : public ui::OutputConfigurator::Observer {
+    : public ui::DisplayConfigurator::Observer {
  public:
   DisplayErrorObserver();
   virtual ~DisplayErrorObserver();
 
-  // ui::OutputConfigurator::Observer overrides:
+  // ui::DisplayConfigurator::Observer overrides:
   virtual void OnDisplayModeChangeFailed(ui::OutputState failed_new_state)
       OVERRIDE;
 

ash/display/display_manager.cc

@@ -455,7 +455,7 @@ void DisplayManager::SetDisplayResolution(int64 display_id,
   display_modes_[display_id] = *iter;
 #if defined(OS_CHROMEOS)
   if (base::SysInfo::IsRunningOnChromeOS())
-    Shell::GetInstance()->output_configurator()->OnConfigurationChanged();
+    Shell::GetInstance()->display_configurator()->OnConfigurationChanged();
 #endif
 }
 
@@ -515,7 +515,7 @@ void DisplayManager::SetColorCalibrationProfile(
     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(
@@ -866,7 +866,7 @@ void DisplayManager::SetMirrorMode(bool mirrored) {
   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
@@ -1004,7 +1004,7 @@ 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

ash/display/display_manager.h

@@ -17,7 +17,7 @@
 #include "ui/gfx/display.h"
 
 #if defined(OS_CHROMEOS)
-#include "ui/display/chromeos/output_configurator.h"
+#include "ui/display/chromeos/display_configurator.h"
 #endif
 
 namespace gfx {
@@ -44,7 +44,7 @@ class SystemGestureEventFilterTest;
 // TODO(oshima): Make this non internal.
 class ASH_EXPORT DisplayManager
 #if defined(OS_CHROMEOS)
-    : public ui::OutputConfigurator::SoftwareMirroringController
+    : public ui::DisplayConfigurator::SoftwareMirroringController
 #endif
       {
  public:

ash/display/event_transformation_handler.cc

@@ -17,7 +17,7 @@
 #include "ui/gfx/screen.h"
 
 #if defined(OS_CHROMEOS)
-#include "ui/display/chromeos/output_configurator.h"
+#include "ui/display/chromeos/display_configurator.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace ash {
@@ -59,18 +59,18 @@ void EventTransformationHandler::OnScrollEvent(ui::ScrollEvent* event) {
 // the sqrt of
 // (mirror_width * mirror_height) / (native_width * native_height)
 void EventTransformationHandler::OnTouchEvent(ui::TouchEvent* event) {
-  using ui::OutputConfigurator;
-  OutputConfigurator* output_configurator =
-      ash::Shell::GetInstance()->output_configurator();
+  using ui::DisplayConfigurator;
+  DisplayConfigurator* display_configurator =
+      ash::Shell::GetInstance()->display_configurator();
 
-  // Check output_configurator's output_state instead of checking
+  // Check display_configurator's output_state instead of checking
   // DisplayManager::IsMirrored() because the compositor based mirroring
   // won't cause the scaling issue.
-  if (output_configurator->output_state() != ui::OUTPUT_STATE_DUAL_MIRROR)
+  if (display_configurator->output_state() != ui::OUTPUT_STATE_DUAL_MIRROR)
     return;
 
   const std::map<int, float>& area_ratio_map =
-      output_configurator->GetMirroredDisplayAreaRatioMap();
+      display_configurator->GetMirroredDisplayAreaRatioMap();
 
   // TODO(miletus): When there are more than 1 touchscreen (e.g. Link connected
   // to an external touchscreen), the correct way to do is to have a way

ash/display/output_configurator_animation.cc

@@ -203,7 +203,7 @@ void OutputConfiguratorAnimation::StartFadeInAnimation() {
 }
 
 void OutputConfiguratorAnimation::OnDisplayModeChanged(
-    const ui::OutputConfigurator::DisplayStateList& outputs) {
+    const ui::DisplayConfigurator::DisplayStateList& outputs) {
   if (!hiding_layers_.empty())
     StartFadeInAnimation();
 }

ash/display/output_configurator_animation.h

@@ -10,7 +10,7 @@
 #include "ash/ash_export.h"
 #include "base/callback.h"
 #include "base/timer/timer.h"
-#include "ui/display/chromeos/output_configurator.h"
+#include "ui/display/chromeos/display_configurator.h"
 
 namespace aura {
 class RootWindow;
@@ -24,10 +24,10 @@ class Layer;
 namespace ash {
 
 // OutputConfiguratorAnimation provides the visual effects for
-// ui::OutputConfigurator, such like fade-out/in during changing
+// ui::DisplayConfigurator, such like fade-out/in during changing
 // the display mode.
 class ASH_EXPORT OutputConfiguratorAnimation
-    : public ui::OutputConfigurator::Observer {
+    : public ui::DisplayConfigurator::Observer {
  public:
   OutputConfiguratorAnimation();
   virtual ~OutputConfiguratorAnimation();
@@ -41,9 +41,9 @@ class ASH_EXPORT OutputConfiguratorAnimation
   void StartFadeInAnimation();
 
  protected:
-  // ui::OutputConfigurator::Observer overrides:
+  // ui::DisplayConfigurator::Observer overrides:
   virtual void OnDisplayModeChanged(
-      const ui::OutputConfigurator::DisplayStateList& outputs) OVERRIDE;
+      const ui::DisplayConfigurator::DisplayStateList& outputs) OVERRIDE;
   virtual void OnDisplayModeChangeFailed(ui::OutputState failed_new_state)
       OVERRIDE;
 

ash/display/projecting_observer_chromeos.cc

@@ -18,7 +18,7 @@ ProjectingObserver::ProjectingObserver()
 ProjectingObserver::~ProjectingObserver() {}
 
 void ProjectingObserver::OnDisplayModeChanged(
-    const ui::OutputConfigurator::DisplayStateList& outputs) {
+    const ui::DisplayConfigurator::DisplayStateList& outputs) {
   has_internal_output_ = false;
   output_count_ = outputs.size();
 

ash/display/projecting_observer_chromeos.h

@@ -6,21 +6,21 @@
 #define ASH_DISPLAY_PROJECTING_OBSERVER_CHROMEOS_H_
 
 #include "ash/ash_export.h"
-#include "ui/display/chromeos/output_configurator.h"
+#include "ui/display/chromeos/display_configurator.h"
 
 namespace ash {
 
-class ASH_EXPORT ProjectingObserver : public ui::OutputConfigurator::Observer {
+class ASH_EXPORT ProjectingObserver : public ui::DisplayConfigurator::Observer {
  public:
   ProjectingObserver();
   virtual ~ProjectingObserver();
 
   // Called when a casting session is started or stopped.
   void OnCastingSessionStartedOrStopped(bool started);
 
-  // OutputConfigurator::Observer implementation:
+  // DisplayConfigurator::Observer implementation:
   virtual void OnDisplayModeChanged(
-      const ui::OutputConfigurator::DisplayStateList& outputs) OVERRIDE;
+      const ui::DisplayConfigurator::DisplayStateList& outputs) OVERRIDE;
 
  private:
   // Sends the current projecting state to power manager.