| Index: chrome/browser/chromeos/status/power_menu_button.cc
|
| diff --git a/chrome/browser/chromeos/status/power_menu_button.cc b/chrome/browser/chromeos/status/power_menu_button.cc
|
| index 468adfd7852cfc358cfa945be45fafb55d0f9560..09f376db3a4c3bd03b5066797355382c0f95563e 100644
|
| --- a/chrome/browser/chromeos/status/power_menu_button.cc
|
| +++ b/chrome/browser/chromeos/status/power_menu_button.cc
|
| @@ -11,7 +11,7 @@
|
| #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 "grit/generated_resources.h"
|
| #include "grit/theme_resources.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| @@ -254,11 +254,11 @@ PowerMenuButton::PowerMenuButton(StatusAreaHost* host)
|
| battery_time_to_empty_(TimeDelta::FromMicroseconds(kInitialMS)),
|
| status_(NULL) {
|
| UpdateIconAndLabelInfo();
|
| - CrosLibrary::Get()->GetPowerLibrary()->AddObserver(this);
|
| + DBusThreadManager::Get()->power_manager_client()->AddObserver(this);
|
| }
|
|
|
| PowerMenuButton::~PowerMenuButton() {
|
| - CrosLibrary::Get()->GetPowerLibrary()->RemoveObserver(this);
|
| + DBusThreadManager::Get()->power_manager_client()->RemoveObserver(this);
|
| }
|
|
|
| // PowerMenuButton, views::MenuDelegate implementation:
|
| @@ -319,7 +319,7 @@ void PowerMenuButton::OnLocaleChanged() {
|
|
|
| void PowerMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
|
| // Explicitly query the power status.
|
| - CrosLibrary::Get()->GetPowerLibrary()->RequestStatusUpdate();
|
| + DBusThreadManager::Get()->power_manager_client()->RequestStatusUpdate();
|
|
|
| views::MenuItemView* menu = new views::MenuItemView(this);
|
| // MenuRunner takes ownership of |menu|.
|
| @@ -348,7 +348,7 @@ void PowerMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -// PowerMenuButton, PowerLibrary::Observer implementation:
|
| +// PowerMenuButton, PowerManagerClient::Observer implementation:
|
|
|
| void PowerMenuButton::PowerChanged(const PowerSupplyStatus& power_status) {
|
| power_status_ = power_status;
|
|
|