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

2 files changed, 13 insertions, 14 deletions

diff --git a/apps/shell/browser/shell_desktop_controller.cc b/apps/shell/browser/shell_desktop_controller.cc
index 373b881..7c8723b 100644
--- a/apps/shell/browser/shell_desktop_controller.cc
+++ b/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();
diff --git a/apps/shell/browser/shell_desktop_controller.h b/apps/shell/browser/shell_desktop_controller.h
index 1dcf503..02b0a34 100644
--- a/apps/shell/browser/shell_desktop_controller.h
+++ b/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.