| Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| index 4c1a6f0958f05a5e8c6c6278c6f15056762289a8..68b6e7b3e1b08041bbcd1eaeecb1ea177b32ba7a 100644
|
| --- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| +++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| @@ -7,6 +7,7 @@
|
| #include "ash/shell.h"
|
| #include "ash/system/audio/audio_controller.h"
|
| #include "ash/system/brightness/brightness_controller.h"
|
| +#include "ash/system/power/power_status_controller.h"
|
| #include "ash/system/tray/system_tray.h"
|
| #include "ash/system/tray/system_tray_delegate.h"
|
| #include "base/logging.h"
|
| @@ -29,6 +30,8 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
|
| explicit SystemTrayDelegate(ash::SystemTray* tray) : tray_(tray) {
|
| AudioHandler::GetInstance()->AddVolumeObserver(this);
|
| DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
|
| + DBusThreadManager::Get()->GetPowerManagerClient()->RequestStatusUpdate(
|
| + PowerManagerClient::UPDATE_USER);
|
| }
|
|
|
| virtual ~SystemTrayDelegate() {
|
| @@ -102,8 +105,13 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
|
| OnBrightnessChanged(level / 100.f, user_initiated);
|
| }
|
|
|
| + virtual void PowerChanged(const PowerSupplyStatus& power_status) OVERRIDE {
|
| + ash::Shell::GetInstance()->power_status_controller()->
|
| + OnPowerStatusChanged(power_status);
|
| + }
|
| +
|
| // TODO(sad): Override more from PowerManagerClient::Observer here (e.g.
|
| - // PowerChanged, PowerButtonStateChanged etc.).
|
| + // PowerButtonStateChanged etc.).
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
|
| };
|
|
|