Renamed OutputConfigurator to DisplayConfigurator

apps/shell/browser/shell_desktop_controller.cc

Index: apps/shell/browser/shell_desktop_controller.cc
diff --git a/apps/shell/browser/shell_desktop_controller.cc b/apps/shell/browser/shell_desktop_controller.cc
index 9725c5187faa7c3bc03ff53d72fdbc7eb864d5db..4b4b4cd9acdda086df77b51f9aef544c9806346e 100644
--- a/apps/shell/browser/shell_desktop_controller.cc
+++ b/apps/shell/browser/shell_desktop_controller.cc
@@ -50,10 +50,10 @@ class ShellViewsDelegate : public views::TestViewsDelegate {
 
 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();
 
@@ -75,7 +75,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);
@@ -107,8 +107,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();