Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index 194c4e528739bdc61b63442956bb356a40a99977..63de0d8efa9537a58b2c50aeaab07ccf61b22930 100644 |
--- a/ash/shell.cc |
+++ b/ash/shell.cc |
@@ -28,7 +28,6 @@ |
#include "ash/system/ime/tray_ime.h" |
#include "ash/system/network/tray_network.h" |
#include "ash/system/power/power_status_observer.h" |
-#include "ash/system/power/power_supply_status.h" |
#include "ash/system/power/tray_power.h" |
#include "ash/system/settings/tray_settings.h" |
#include "ash/system/tray/system_tray_delegate.h" |
@@ -67,6 +66,7 @@ |
#include "ash/wm/workspace/workspace_manager.h" |
#include "base/bind.h" |
#include "base/command_line.h" |
+#include "chromeos/dbus/power_supply_status.h" |
#include "grit/ui_resources.h" |
#include "third_party/skia/include/core/SkBitmap.h" |
#include "ui/aura/client/aura_constants.h" |
@@ -295,8 +295,8 @@ class DummySystemTrayDelegate : public SystemTrayDelegate { |
return base::k24HourClock; |
} |
- virtual PowerSupplyStatus GetPowerSupplyStatus() const OVERRIDE { |
- return PowerSupplyStatus(); |
+ virtual chromeos::PowerSupplyStatus GetPowerSupplyStatus() const OVERRIDE { |
+ return chromeos::PowerSupplyStatus(); |
} |
virtual void ShowSettings() OVERRIDE { |