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 1dcf5038624c32ab59f053c47f2b372d4515460f..02b0a34a71b346765ae32c0e5a2ecc772fc64dd9 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.