chromeos: Add power supply info reading capability

chrome/browser/chromeos/status/power_menu_button.cc

 // Copyright (c) 2011 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 "chrome/browser/chromeos/status/power_menu_button.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/status/status_area_bubble.h"
 #include "chrome/browser/chromeos/view_ids.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
@@ skipping 184 matching lines @@
 PowerMenuButton::PowerMenuButton(StatusAreaButton::Delegate* delegate)
     : StatusAreaButton(delegate, this),
       battery_is_present_(false),
       line_power_on_(false),
       battery_percentage_(0.0),
       battery_time_to_full_(TimeDelta::FromMicroseconds(kInitialMS)),
       battery_time_to_empty_(TimeDelta::FromMicroseconds(kInitialMS)),
       status_(NULL) {
   set_id(VIEW_ID_STATUS_BUTTON_POWER);
   UpdateIconAndLabelInfo();
-  CrosLibrary::Get()->GetPowerLibrary()->AddObserver(this);
+  DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
 }
 
 PowerMenuButton::~PowerMenuButton() {
-  CrosLibrary::Get()->GetPowerLibrary()->RemoveObserver(this);
+  DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
 }
 
 // PowerMenuButton, views::MenuDelegate implementation:
 
 string16 PowerMenuButton::GetLabel(int id) const {
   return string16();
 }
 
 string16 PowerMenuButton::GetBatteryIsChargedText() const {
   // The second item shows the battery is charged if it is.
@@ skipping 36 matching lines @@
 // PowerMenuButton, views::View implementation:
 void PowerMenuButton::OnLocaleChanged() {
   UpdateIconAndLabelInfo();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PowerMenuButton, views::ViewMenuDelegate implementation:
 
 void PowerMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
   // Explicitly query the power status.
-  CrosLibrary::Get()->GetPowerLibrary()->RequestStatusUpdate();
+  DBusThreadManager::Get()->GetPowerManagerClient()->RequestStatusUpdate();
 
   views::MenuItemView* menu = new views::MenuItemView(this);
   // MenuRunner takes ownership of |menu|.
   menu_runner_.reset(new views::MenuRunner(menu));
   views::MenuItemView* submenu = menu->AppendMenuItem(
       POWER_BATTERY_PERCENTAGE_ITEM,
       string16(),
       views::MenuItemView::NORMAL);
   status_ = new StatusAreaBubbleContentView(new BatteryIconView, string16());
   UpdateStatusView();
   submenu->AddChildView(status_);
   menu->CreateSubmenu()->set_resize_open_menu(true);
   menu->SetMargins(0, 0);
   submenu->SetMargins(0, 0);
   menu->ChildrenChanged();
 
   gfx::Point screen_location;
   views::View::ConvertPointToScreen(source, &screen_location);
   gfx::Rect bounds(screen_location, source->size());
   if (menu_runner_->RunMenuAt(
           source->GetWidget()->GetTopLevelWidget(), this, bounds,
           views::MenuItemView::TOPRIGHT, views::MenuRunner::HAS_MNEMONICS) ==
       views::MenuRunner::MENU_DELETED)
     return;
   status_ = NULL;
   menu_runner_.reset(NULL);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// PowerMenuButton, PowerLibrary::Observer implementation:
+// PowerMenuButton, PowerManagerClient::Observer implementation:
 
 void PowerMenuButton::PowerChanged(const PowerSupplyStatus& power_status) {
   power_status_ = power_status;
   UpdateIconAndLabelInfo();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PowerMenuButton, StatusAreaButton implementation:
 
 void PowerMenuButton::UpdateIconAndLabelInfo() {
@@ skipping 58 matching lines @@
   // If previous is 0, then it either was never set (initial condition)
   // or got down to 0.
   if (*previous == TimeDelta::FromMicroseconds(kInitialMS) ||
       diff < kMinDiff ||
       diff > kMaxDiff) {
     *previous = current;
   }
 }
 
 }  // namespace chromeos