Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(358)

Unified Diff: chrome/browser/chromeos/status/power_menu_button.h

Issue 8347016: chromeos: Simplify power supply info in PowerLibrary (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed copy error Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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_;

Powered by Google App Engine
This is Rietveld 408576698