Index: athena/system/power_button_controller.h |
diff --git a/athena/system/power_button_controller.h b/athena/system/power_button_controller.h |
index b1540b9e38170bc5f3c1a750e00984e567f6413f..3077af08680e8e3d4bb4176cc11a31d80524462c 100644 |
--- a/athena/system/power_button_controller.h |
+++ b/athena/system/power_button_controller.h |
@@ -5,10 +5,10 @@ |
#ifndef ATHENA_SYSTEM_POWER_BUTTON_CONTROLLER_H_ |
#define ATHENA_SYSTEM_POWER_BUTTON_CONTROLLER_H_ |
+#include "athena/input/public/input_manager.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/time/time.h" |
#include "base/timer/timer.h" |
-#include "chromeos/dbus/power_manager_client.h" |
namespace aura { |
class Window; |
@@ -21,7 +21,7 @@ class Widget; |
namespace athena { |
// Shuts down in response to the power button being pressed. |
-class PowerButtonController : public chromeos::PowerManagerClient::Observer { |
+class PowerButtonController : public PowerButtonObserver { |
oshima
2014/10/15 22:28:53
This class should probably be renamed to something
|
public: |
explicit PowerButtonController(aura::Window* dialog_container); |
virtual ~PowerButtonController(); |
@@ -47,11 +47,9 @@ class PowerButtonController : public chromeos::PowerManagerClient::Observer { |
// Requests shutdown. |
void Shutdown(); |
- // chromeos::PowerManagerClient::Observer: |
- virtual void BrightnessChanged(int level, bool user_initiated) override; |
- virtual void PowerButtonEventReceived( |
- bool down, |
- const base::TimeTicks& timestamp) override; |
+ // PowerButtonObserver: |
+ virtual void OnPowerButtonStateChanged( |
+ PowerButtonObserver::State state) override; |
// |shutdown_warning_message_|'s parent container. |
aura::Window* warning_message_container_; |
@@ -59,12 +57,6 @@ class PowerButtonController : public chromeos::PowerManagerClient::Observer { |
// Shows a warning that the device is about to be shutdown. |
scoped_ptr<views::Widget> shutdown_warning_message_; |
- // Whether the screen brightness was reduced to 0%. |
- bool brightness_is_zero_; |
- |
- // The last time at which the screen brightness was 0%. |
- base::TimeTicks zero_brightness_end_time_; |
- |
State state_; |
base::OneShotTimer<PowerButtonController> timer_; |