Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ash / wm / power_button_controller.h

diff --git a/src/ash/wm/power_button_controller.h b/src/ash/wm/power_button_controller.h
index f2ab809..f178014 100644 (file)
--- a/src/ash/wm/power_button_controller.h
+++ b/src/ash/wm/power_button_controller.h
@@ -9,8 +9,8 @@
 #include "ash/wm/session_state_animator.h"
 #include "base/basictypes.h"
 
-#if defined(OS_CHROMEOS) && defined(USE_X11)
-#include "ui/display/chromeos/output_configurator.h"
+#if defined(OS_CHROMEOS)
+#include "ui/display/chromeos/display_configurator.h"
 #endif
 
 namespace gfx {
@@ -33,10 +33,10 @@ class LockStateController;
 // Displays onscreen animations and locks or suspends the system in response to
 // the power button being pressed or released.
 class ASH_EXPORT PowerButtonController
-// TODO(derat): Remove these ifdefs after OutputConfigurator becomes
+// TODO(derat): Remove these ifdefs after DisplayConfigurator becomes
 // cross-platform.
-#if defined(OS_CHROMEOS) && defined(USE_X11)
-    : public ui::OutputConfigurator::Observer
+#if defined(OS_CHROMEOS)
+    : public ui::DisplayConfigurator::Observer
 #endif
       {
  public:
@@ -54,10 +54,10 @@ class ASH_EXPORT PowerButtonController
   void OnPowerButtonEvent(bool down, const base::TimeTicks& timestamp);
   void OnLockButtonEvent(bool down, const base::TimeTicks& timestamp);
 
-#if defined(OS_CHROMEOS) && defined(USE_X11)
-  // Overriden from ui::OutputConfigurator::Observer:
+#if defined(OS_CHROMEOS)
+  // Overriden from ui::DisplayConfigurator::Observer:
   virtual void OnDisplayModeChanged(
-      const ui::OutputConfigurator::DisplayStateList& outputs) OVERRIDE;
+      const ui::DisplayConfigurator::DisplayStateList& outputs) OVERRIDE;
 #endif
 
  private: