chromeos: Refactor system tray code into PowerStatus.

ash/system/chromeos/settings/tray_settings.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/chromeos/settings/tray_settings.h"
 
 #include "ash/shell.h"
 #include "ash/system/chromeos/power/power_status.h"
 #include "ash/system/chromeos/power/power_status_view.h"
 #include "ash/system/tray/actionable_view.h"
@@ skipping 12 matching lines @@
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 
 namespace ash {
 namespace internal {
 
 namespace tray {
 
-class SettingsDefaultView : public ActionableView {
+class SettingsDefaultView : public ActionableView,
+                            public PowerStatus::Observer {
  public:
   explicit SettingsDefaultView(user::LoginStatus status)
       : login_status_(status),
         label_(NULL),
         power_status_view_(NULL) {
+    PowerStatus::Get()->AddObserver(this);
     SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
         ash::kTrayPopupPaddingHorizontal, 0,
         ash::kTrayPopupPaddingBetweenItems));
 
     bool power_view_right_align = false;
     if (login_status_ != user::LOGGED_IN_NONE &&
         login_status_ != user::LOGGED_IN_LOCKED) {
       ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
       views::ImageView* icon =
           new ash::internal::FixedSizedImageView(0, ash::kTrayPopupItemHeight);
       icon->SetImage(
           rb.GetImageNamed(IDR_AURA_UBER_TRAY_SETTINGS).ToImageSkia());
       AddChildView(icon);
 
       base::string16 text = rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_SETTINGS);
       label_ = new views::Label(text);
       AddChildView(label_);
       SetAccessibleName(text);
 
       power_view_right_align = true;
     }
 
-    chromeos::PowerSupplyStatus power_status =
-        PowerStatus::Get()->GetPowerSupplyStatus();
-    if (power_status.battery_is_present) {
+    if (PowerStatus::Get()->IsBatteryPresent()) {
       power_status_view_ = new ash::internal::PowerStatusView(
           ash::internal::PowerStatusView::VIEW_DEFAULT, power_view_right_align);
       AddChildView(power_status_view_);
-      UpdatePowerStatus(power_status);
+      OnPowerStatusChanged();
     }
   }
 
-  virtual ~SettingsDefaultView() {}
-
-  void UpdatePowerStatus(const chromeos::PowerSupplyStatus& status) {
-    if (!power_status_view_)
-      return;
-    power_status_view_->UpdatePowerStatus(status);
-    base::string16 accessible_name = label_ ?
-        label_->text() + ASCIIToUTF16(", ") +
-            power_status_view_->accessible_name() :
-        power_status_view_->accessible_name();
-    SetAccessibleName(accessible_name);
+  virtual ~SettingsDefaultView() {
+    PowerStatus::Get()->RemoveObserver(this);
   }
 
   // Overridden from ash::internal::ActionableView.
   virtual bool PerformAction(const ui::Event& event) OVERRIDE {
     if (login_status_ == user::LOGGED_IN_NONE ||
         login_status_ == user::LOGGED_IN_LOCKED)
       return false;
 
     ash::Shell::GetInstance()->system_tray_delegate()->ShowSettings();
     return true;
@@ skipping 13 matching lines @@
       power_status_view_->SetBoundsRect(bounds);
     }
   }
 
   // Overridden from views::View.
   virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE {
     views::View::ChildPreferredSizeChanged(child);
     Layout();
   }
 
+  // Overridden from PowerStatus::Observer.
+  virtual void OnPowerStatusChanged() OVERRIDE {
+    if (!PowerStatus::Get()->IsBatteryPresent())
+      return;
+
+    base::string16 accessible_name = label_ ?
+        label_->text() + ASCIIToUTF16(", ") +
+            PowerStatus::Get()->GetAccessibleNameString() :
+        PowerStatus::Get()->GetAccessibleNameString();
+    SetAccessibleName(accessible_name);
+  }
+
  private:
   user::LoginStatus login_status_;
   views::Label* label_;
   ash::internal::PowerStatusView* power_status_view_;
 
   DISALLOW_COPY_AND_ASSIGN(SettingsDefaultView);
  };
 
 }  // namespace tray
 
 TraySettings::TraySettings(SystemTray* system_tray)
     : SystemTrayItem(system_tray),
       default_view_(NULL) {
-  PowerStatus::Get()->AddObserver(this);
 }
 
 TraySettings::~TraySettings() {
-  PowerStatus::Get()->RemoveObserver(this);
 }
 
 views::View* TraySettings::CreateTrayView(user::LoginStatus status) {
   return NULL;
 }
 
 views::View* TraySettings::CreateDefaultView(user::LoginStatus status) {
   if ((status == user::LOGGED_IN_NONE || status == user::LOGGED_IN_LOCKED) &&
-      !PowerStatus::Get()->GetPowerSupplyStatus().battery_is_present)
+      !PowerStatus::Get()->IsBatteryPresent())
     return NULL;
 
   CHECK(default_view_ == NULL);
   default_view_ =  new tray::SettingsDefaultView(status);
   return default_view_;
 }
 
 views::View* TraySettings::CreateDetailedView(user::LoginStatus status) {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 void TraySettings::DestroyTrayView() {
 }
 
 void TraySettings::DestroyDefaultView() {
   default_view_ = NULL;
 }
 
 void TraySettings::DestroyDetailedView() {
 }
 
 void TraySettings::UpdateAfterLoginStatusChange(user::LoginStatus status) {
 }
 
-void TraySettings::OnPowerStatusChanged(
-    const chromeos::PowerSupplyStatus& status) {
-  if (default_view_)
-    default_view_->UpdatePowerStatus(status);
-}
-
 }  // namespace internal
 }  // namespace ash