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

Unified Diff: ash/system/power/power_supply_status.h

Issue 9837075: Move power_supply_status.* from src/ash to src/chromeos (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase Created 8 years, 8 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
« no previous file with comments | « ash/system/power/power_status_observer.h ('k') | ash/system/power/power_supply_status.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/power/power_supply_status.h
diff --git a/ash/system/power/power_supply_status.h b/ash/system/power/power_supply_status.h
index c70101bb7d6622525001ac357ca51e7dac6facb1..03d70a53d1b19de8c4004ac6be6d91842a7aa029 100644
--- a/ash/system/power/power_supply_status.h
+++ b/ash/system/power/power_supply_status.h
@@ -10,8 +10,16 @@
#include "ash/ash_export.h"
#include "base/basictypes.h"
+#if defined(OS_CHROMEOS)
+#include "chromeos/dbus/power_supply_status.h"
+#endif
+
namespace ash {
+#if defined(OS_CHROMEOS)
+typedef chromeos::PowerSupplyStatus PowerSupplyStatus;
+#else
+// Define local struct when not building for Chrome OS.
struct ASH_EXPORT PowerSupplyStatus {
bool line_power_on;
@@ -27,6 +35,7 @@ struct ASH_EXPORT PowerSupplyStatus {
PowerSupplyStatus();
std::string ToString() const;
};
+#endif // defined(OS_CHROMEOS)
} // namespace ash
« no previous file with comments | « ash/system/power/power_status_observer.h ('k') | ash/system/power/power_supply_status.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698