| 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..d0306f76da4ea30231c6f2d2787b4f1ba5662a65 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_ASH)
|
| +#include "ash/system/power/power_supply_status.h"
|
| +#endif
|
| +
|
| namespace base {
|
| class TimeTicks;
|
| }
|
| @@ -19,6 +23,9 @@ class Bus;
|
|
|
| namespace chromeos {
|
|
|
| +#if defined(USE_ASH)
|
| +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.
|
|
|