Chromium Code Reviews| Index: chrome/browser/chromeos/status/power_menu_button.h |
| diff --git a/chrome/browser/chromeos/status/power_menu_button.h b/chrome/browser/chromeos/status/power_menu_button.h |
| index f1c31fbf874e67940f75f70f2a7805dadf8a8d80..37279fd88c49dcca9bff74a84ef8feb98baaf546 100644 |
| --- a/chrome/browser/chromeos/status/power_menu_button.h |
| +++ b/chrome/browser/chromeos/status/power_menu_button.h |
| @@ -8,6 +8,7 @@ |
| #include "chrome/browser/chromeos/cros/power_library.h" |
| #include "chrome/browser/chromeos/status/status_area_button.h" |
| +#include "third_party/cros/chromeos_power.h" |
|
stevenjb
2011/10/18 23:08:23
We shouldn't use the PowerStatus struct defined in
Simon Que
2011/10/18 23:17:28
Agreed, but I was hoping to do it after this patch
|
| #include "views/controls/menu/menu_delegate.h" |
| #include "views/controls/menu/view_menu_delegate.h" |
| @@ -38,7 +39,7 @@ class PowerMenuButton : public StatusAreaButton, |
| virtual bool IsCommandEnabled(int id) const; |
| // PowerLibrary::Observer implementation. |
| - virtual void PowerChanged(PowerLibrary* obj); |
| + virtual void PowerChanged(const PowerStatus& power_status); |
| virtual void SystemResumed() {} |
| int battery_index() const { return battery_index_; } |
| @@ -71,6 +72,8 @@ class PowerMenuButton : public StatusAreaButton, |
| bool line_power_on_; |
| double battery_percentage_; |
| int battery_index_; |
| + PowerStatus power_status_; |
| + |
| base::TimeDelta battery_time_to_full_; |
| base::TimeDelta battery_time_to_empty_; |