| Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| index 0a0c600d3f1d9bf618b2e82f61b53d5d7094fc9c..850ee9feb0ba625e8d0db77e2db9140304b7f573 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -13,6 +13,7 @@
|
| #include "chrome/browser/chromeos/boot_times_loader.h"
|
| #include "chrome/browser/chromeos/brightness_observer.h"
|
| #include "chrome/browser/chromeos/cros/cros_library.h"
|
| +#include "chrome/browser/chromeos/cros/power_library.h"
|
| #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
|
| #include "chrome/browser/chromeos/dbus/session_manager_client.h"
|
| #include "chrome/browser/chromeos/login/session_manager_observer.h"
|
| @@ -88,6 +89,10 @@ ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() {
|
| chromeos::DBusThreadManager::Get()->power_manager_client()->RemoveObserver(
|
| brightness_observer_.get());
|
| }
|
| + chromeos::PowerManagerClient::Observer* power_lib =
|
| + chromeos::CrosLibrary::Get()->GetPowerLibrary();
|
| + chromeos::DBusThreadManager::Get()->power_manager_client()->
|
| + RemoveObserver(power_lib);
|
|
|
| chromeos::DBusThreadManager::Shutdown();
|
|
|
| @@ -144,10 +149,11 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {
|
| chromeos::DBusThreadManager::Initialize();
|
|
|
| // Initialize the brightness observer so that we'll display an onscreen
|
| - // indication of brightness changes during login.
|
| + // indication of brightness changes.
|
| brightness_observer_.reset(new chromeos::BrightnessObserver());
|
| chromeos::DBusThreadManager::Get()->power_manager_client()->AddObserver(
|
| brightness_observer_.get());
|
| +
|
| // Initialize the session manager observer so that we'll take actions
|
| // per signals sent from the session manager.
|
| session_manager_observer_.reset(new chromeos::SessionManagerObserver);
|
| @@ -158,4 +164,10 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {
|
| if (parsed_command_line().HasSwitch(switches::kEnableBluetooth)) {
|
| chromeos::BluetoothManager::Initialize();
|
| }
|
| +
|
| + // Probe for power supply status.
|
| + chromeos::PowerManagerClient::Observer* power_lib =
|
| + chromeos::CrosLibrary::Get()->GetPowerLibrary();
|
| + chromeos::DBusThreadManager::Get()->power_manager_client()->
|
| + AddObserver(power_lib);
|
| }
|
|
|