Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ash / display / display_change_observer_chromeos.h

diff --git a/src/ash/display/display_change_observer_chromeos.h b/src/ash/display/display_change_observer_chromeos.h
index 03a7dc0..1e6521f 100644 (file)
--- a/src/ash/display/display_change_observer_chromeos.h
+++ b/src/ash/display/display_change_observer_chromeos.h
@@ -8,35 +8,34 @@
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
 #include "base/basictypes.h"
-#include "ui/display/chromeos/output_configurator.h"
+#include "ui/display/chromeos/display_configurator.h"
 
 namespace ash {
-namespace internal {
 
 struct DisplayMode;
 
 // An object that observes changes in display configuration and
 // update DisplayManagers.
-class DisplayChangeObserver : public ui::OutputConfigurator::StateController,
-                              public ui::OutputConfigurator::Observer,
+class DisplayChangeObserver : public ui::DisplayConfigurator::StateController,
+                              public ui::DisplayConfigurator::Observer,
                               public ShellObserver {
  public:
   // Returns the resolution list.
   ASH_EXPORT static std::vector<DisplayMode> GetDisplayModeList(
-      const ui::OutputConfigurator::DisplayState& output);
+      const ui::DisplayConfigurator::DisplayState& output);
 
   DisplayChangeObserver();
   virtual ~DisplayChangeObserver();
 
-  // ui::OutputConfigurator::StateController overrides:
-  virtual ui::OutputState GetStateForDisplayIds(
+  // ui::DisplayConfigurator::StateController overrides:
+  virtual ui::MultipleDisplayState GetStateForDisplayIds(
       const std::vector<int64>& outputs) const OVERRIDE;
   virtual bool GetResolutionForDisplayId(int64 display_id,
                                          gfx::Size* size) const OVERRIDE;
 
-  // Overriden from ui::OutputConfigurator::Observer:
+  // Overriden from ui::DisplayConfigurator::Observer:
   virtual void OnDisplayModeChanged(
-      const ui::OutputConfigurator::DisplayStateList& outputs) OVERRIDE;
+      const ui::DisplayConfigurator::DisplayStateList& outputs) OVERRIDE;
 
   // Overriden from ShellObserver:
   virtual void OnAppTerminating() OVERRIDE;
@@ -45,7 +44,6 @@ class DisplayChangeObserver : public ui::OutputConfigurator::StateController,
   DISALLOW_COPY_AND_ASSIGN(DisplayChangeObserver);
 };
 
-}  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_AURA_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H