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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/dbus/power_manager_client.cc

Issue 9562008: ash uber tray: Add entry for power and date. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 10 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
« ash/system/tray/system_tray.cc ('K') | « chrome/browser/chromeos/dbus/power_manager_client.h ('k') | chrome/browser/chromeos/system/ash_system_tray_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/dbus/power_manager_client.cc
diff --git a/chrome/browser/chromeos/dbus/power_manager_client.cc b/chrome/browser/chromeos/dbus/power_manager_client.cc
index 1dd3348f57d79d1ab3fcd34dace43ee72a3144ca..1e840abb0a049ce90513301abdc2e1f6f59b8f9e 100644
--- a/chrome/browser/chromeos/dbus/power_manager_client.cc
+++ b/chrome/browser/chromeos/dbus/power_manager_client.cc
@@ -24,6 +24,7 @@
namespace chromeos {
+#if !defined(USE_ASH)
PowerSupplyStatus::PowerSupplyStatus()
: line_power_on(false),
battery_is_present(false),
@@ -55,6 +56,7 @@ std::string PowerSupplyStatus::ToString() const {
battery_seconds_to_full);
return result;
}
+#endif // !defined(USE_ASH)
// The PowerManagerClient implementation used in production.
class PowerManagerClientImpl : public PowerManagerClient {
« ash/system/tray/system_tray.cc ('K') | « chrome/browser/chromeos/dbus/power_manager_client.h ('k') | chrome/browser/chromeos/system/ash_system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698