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

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

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
Index: chrome/browser/chromeos/dbus/power_manager_client.h
diff --git a/chrome/browser/chromeos/dbus/power_manager_client.h b/chrome/browser/chromeos/dbus/power_manager_client.h
index e55c44fe4d42c3e38d74925ac3a324a700983606..6e98f71b22c504552ecbe77f42bff3884b902cc1 100644
--- a/chrome/browser/chromeos/dbus/power_manager_client.h
+++ b/chrome/browser/chromeos/dbus/power_manager_client.h
@@ -10,6 +10,10 @@
#include "base/basictypes.h"
#include "base/callback.h"
+#if defined(USE_AURA)
Ben Goodger (Google) 2012/03/01 23:58:30 USE_ASH, here and elsewhere
sadrul 2012/03/02 01:59:57 Done.
+#include "ash/system/power/power_supply_status.h"
+#endif
+
namespace base {
class TimeTicks;
}
@@ -19,6 +23,9 @@ class Bus;
namespace chromeos {
+#if defined(USE_AURA)
+typedef struct ash::PowerSupplyStatus PowerSupplyStatus;
+#else
// This is the local struct that is used in Chrome.
struct PowerSupplyStatus {
bool line_power_on;
@@ -35,6 +42,7 @@ struct PowerSupplyStatus {
PowerSupplyStatus();
std::string ToString() const;
};
+#endif
// Callback used for processing the idle time. The int64 param is the number of
// seconds the user has been idle.

Powered by Google App Engine
This is Rietveld 408576698