Move chromeos/display/* to ui/display/chromeos

TBR=darin@chromium.org

BUG=333413

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

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

1 files changed, 9 insertions, 11 deletions

diff --git a/ash/display/display_change_observer_chromeos.h b/ash/display/display_change_observer_chromeos.h
index 59c2dee..df0dbb4 100644
--- a/ash/display/display_change_observer_chromeos.h
+++ b/ash/display/display_change_observer_chromeos.h
@@ -8,7 +8,7 @@
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
 #include "base/basictypes.h"
-#include "chromeos/display/output_configurator.h"
+#include "ui/display/chromeos/output_configurator.h"
 
 namespace ash {
 namespace internal {
@@ -17,29 +17,27 @@ struct DisplayMode;
 
 // An object that observes changes in display configuration and
 // update DisplayManagers.
-class DisplayChangeObserver
-    : public chromeos::OutputConfigurator::StateController,
-      public chromeos::OutputConfigurator::Observer,
-      public ShellObserver {
+class DisplayChangeObserver : public ui::OutputConfigurator::StateController,
+                              public ui::OutputConfigurator::Observer,
+                              public ShellObserver {
  public:
   // Returns the resolution list.
   ASH_EXPORT static std::vector<DisplayMode> GetDisplayModeList(
-      const chromeos::OutputConfigurator::OutputSnapshot& output);
+      const ui::OutputConfigurator::OutputSnapshot& output);
 
   DisplayChangeObserver();
   virtual ~DisplayChangeObserver();
 
-  // chromeos::OutputConfigurator::StateController overrides:
+  // ui::OutputConfigurator::StateController overrides:
   virtual ui::OutputState GetStateForDisplayIds(
       const std::vector<int64>& outputs) const OVERRIDE;
   virtual bool GetResolutionForDisplayId(int64 display_id,
                                          int* width,
                                          int* height) const OVERRIDE;
 
-  // Overriden from chromeos::OutputConfigurator::Observer:
-  virtual void OnDisplayModeChanged(
-      const std::vector<chromeos::OutputConfigurator::OutputSnapshot>& outputs)
-      OVERRIDE;
+  // Overriden from ui::OutputConfigurator::Observer:
+  virtual void OnDisplayModeChanged(const std::vector<
+      ui::OutputConfigurator::OutputSnapshot>& outputs) OVERRIDE;
 
   // Overriden from ShellObserver:
   virtual void OnAppTerminating() OVERRIDE;