Move power_supply_status.* from src/ash to src/chromeos

ash/shell.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 
 #include "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
@@ skipping 10 matching lines @@
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/tray_volume.h"
 #include "ash/system/bluetooth/tray_bluetooth.h"
 #include "ash/system/brightness/tray_brightness.h"
 #include "ash/system/date/tray_date.h"
 #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"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_empty.h"
 #include "ash/system/tray_accessibility.h"
 #include "ash/system/tray_caps_lock.h"
 #include "ash/system/user/tray_user.h"
 #include "ash/tooltips/tooltip_controller.h"
 #include "ash/wm/activation_controller.h"
@@ skipping 18 matching lines @@
 #include "ash/wm/visibility_controller.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_modality_controller.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
 #include "ash/wm/workspace/workspace_event_filter.h"
 #include "ash/wm/workspace/workspace_layout_manager.h"
 #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"
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/monitor.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/ui_controls_aura.h"
@@ skipping 208 matching lines @@
   }
 
   virtual int GetSystemUpdateIconResource() const OVERRIDE {
     return IDR_AURA_UBER_TRAY_UPDATE;
   }
 
   virtual base::HourClockType GetHourClockType() const OVERRIDE {
     return base::k24HourClock;
   }
 
-  virtual PowerSupplyStatus GetPowerSupplyStatus() const OVERRIDE {
-    return PowerSupplyStatus();
+  virtual chromeos::PowerSupplyStatus GetPowerSupplyStatus() const OVERRIDE {
+    return chromeos::PowerSupplyStatus();
   }
 
   virtual void ShowSettings() OVERRIDE {
   }
 
   virtual void ShowDateSettings() OVERRIDE {
   }
 
   virtual void ShowNetworkSettings() OVERRIDE {
   }
@@ skipping 575 matching lines @@
   desktop_background_controller_->SetDesktopBackgroundImageMode(
       GetWallpaper(index), GetWallpaperInfo(index).layout);
 }
 
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash