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

ash/system/power/tray_power.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/system/power/tray_power.h"
 
 #include "ash/shell.h"
 #include "ash/system/date/date_view.h"
-#include "ash/system/power/power_supply_status.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
+#include "chromeos/dbus/power_supply_status.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/size.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/text_button.h"
@@ skipping 21 matching lines @@
 // This view is used only for the tray.
 class PowerTrayView : public views::ImageView {
  public:
   PowerTrayView() {
     UpdateImage();
   }
 
   virtual ~PowerTrayView() {
   }
 
-  void UpdatePowerStatus(const PowerSupplyStatus& status) {
+  void UpdatePowerStatus(const chromeos::PowerSupplyStatus& status) {
     supply_status_ = status;
     // Sanitize.
     if (supply_status_.battery_is_full)
       supply_status_.battery_percentage = 100.0;
 
     UpdateImage();
     SetVisible(status.battery_is_present);
   }
 
  private:
@@ skipping 17 matching lines @@
 
     SkIRect region = SkIRect::MakeXYWH(
         supply_status_.line_power_on ? kBatteryImageWidth : 0,
         image_index * kBatteryImageHeight,
         kBatteryImageWidth, kBatteryImageHeight);
     all.ToSkBitmap()->extractSubset(&image, region);
 
     SetImage(image);
   }
 
-  PowerSupplyStatus supply_status_;
+  chromeos::PowerSupplyStatus supply_status_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerTrayView);
 };
 
 // This view is used only for the popup.
 class PowerPopupView : public views::Label {
  public:
   PowerPopupView() {
     SetHorizontalAlignment(ALIGN_RIGHT);
     UpdateText();
   }
 
   virtual ~PowerPopupView() {
   }
 
-  void UpdatePowerStatus(const PowerSupplyStatus& status) {
+  void UpdatePowerStatus(const chromeos::PowerSupplyStatus& status) {
     supply_status_ = status;
     // Sanitize.
     if (supply_status_.battery_is_full)
       supply_status_.battery_percentage = 100.0;
 
     UpdateText();
   }
 
  private:
   void UpdateText() {
@@ skipping 13 matching lines @@
     } else {
       if (supply_status_.line_power_on) {
         SetText(bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_BATTERY_FULL));
       } else {
         // Completely discharged? ... ha?
         SetText(string16());
       }
     }
   }
 
-  PowerSupplyStatus supply_status_;
+  chromeos::PowerSupplyStatus supply_status_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerPopupView);
 };
 
 }  // namespace tray
 
 TrayPower::TrayPower()
     : power_(NULL),
       power_tray_(NULL) {
 }
 
 TrayPower::~TrayPower() {
 }
 
 views::View* TrayPower::CreateTrayView(user::LoginStatus status) {
   // There may not be enough information when this is created about whether
   // there is a battery or not. So always create this, and adjust visibility as
   // necessary.
-  PowerSupplyStatus power_status =
+  chromeos::PowerSupplyStatus power_status =
       ash::Shell::GetInstance()->tray_delegate()->GetPowerSupplyStatus();
   power_tray_.reset(new tray::PowerTrayView());
   power_tray_->UpdatePowerStatus(power_status);
   return power_tray_.get();
 }
 
 views::View* TrayPower::CreateDefaultView(user::LoginStatus status) {
   date_.reset(new tray::DateView(tray::DateView::DATE));
   if (status != user::LOGGED_IN_NONE)
     date_->set_actionable(true);
 
   views::View* container = new views::View;
   views::BoxLayout* layout = new views::BoxLayout(views::BoxLayout::kHorizontal,
       kTrayPopupPaddingHorizontal, 10, 0);
   layout->set_spread_blank_space(true);
   container->SetLayoutManager(layout);
   container->set_background(views::Background::CreateSolidBackground(
       SkColorSetRGB(245, 245, 245)));
   container->AddChildView(date_.get());
 
-  PowerSupplyStatus power_status =
+  chromeos::PowerSupplyStatus power_status =
       ash::Shell::GetInstance()->tray_delegate()->GetPowerSupplyStatus();
   if (power_status.battery_is_present) {
     power_.reset(new tray::PowerPopupView());
     power_->UpdatePowerStatus(power_status);
     container->AddChildView(power_.get());
   }
   return container;
 }
 
 views::View* TrayPower::CreateDetailedView(user::LoginStatus status) {
   return NULL;
 }
 
 void TrayPower::DestroyTrayView() {
   power_tray_.reset();
 }
 
 void TrayPower::DestroyDefaultView() {
   date_.reset();
   power_.reset();
 }
 
 void TrayPower::DestroyDetailedView() {
 }
 
-void TrayPower::OnPowerStatusChanged(const PowerSupplyStatus& status) {
+void TrayPower::OnPowerStatusChanged(
+    const chromeos::PowerSupplyStatus& status) {
   if (power_tray_.get())
     power_tray_->UpdatePowerStatus(status);
   if (power_.get())
     power_->UpdatePowerStatus(status);
 }
 
 }  // namespace internal
 }  // namespace ash