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

Unified Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 9983002: Pass correct initial/user values when requesting power status (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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/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 423e74f3bb57b35b72dd5f88787e744597512aa7..007abda19f377f52be2a36290f6713826a5f29de 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -238,10 +238,23 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
return clock_type_;
}
- virtual PowerSupplyStatus GetPowerSupplyStatus() const OVERRIDE {
+ virtual PowerSupplyStatus GetPowerSupplyStatus(
+ UpdateRequestType request_type) const OVERRIDE {
+ PowerManagerClient::UpdateRequestType type(PowerManagerClient::UPDATE_POLL);
+ switch (request_type) {
+ case UPDATE_INITIAL:
+ type = PowerManagerClient::UPDATE_INITIAL;
+ break;
+ case UPDATE_USER:
+ type = PowerManagerClient::UPDATE_USER;
+ break;
+ case UPDATE_POLL:
+ type = PowerManagerClient::UPDATE_POLL;
+ break;
+ };
// Explicitly query the power status.
DBusThreadManager::Get()->GetPowerManagerClient()->RequestStatusUpdate(
- PowerManagerClient::UPDATE_USER);
+ type);
return power_supply_status_;
}

Powered by Google App Engine
This is Rietveld 408576698