Renamed OutputConfigurator to DisplayConfigurator

apps/shell/browser/shell_desktop_controller.h

Index: apps/shell/browser/shell_desktop_controller.h
diff --git a/apps/shell/browser/shell_desktop_controller.h b/apps/shell/browser/shell_desktop_controller.h
index 3420790bd0116e91ab9555cb1affdb68b56a23b3..e05129a10c2d42f10a1f887177ece6310e9db54c 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 {
@@ -29,7 +29,7 @@ namespace apps {
 // Handles desktop-related tasks for app_shell.
 class ShellDesktopController
 #if defined(OS_CHROMEOS)
-    : public ui::OutputConfigurator::Observer
+    : public ui::DisplayConfigurator::Observer
 #endif
       {
  public:
@@ -40,10 +40,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:
@@ -58,7 +57,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.