| 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 15d1754b4ba42e2a1039b790ede614d93dfeb9df..06352aedd0d21a24101842d7fe41703513e1ba13 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -60,6 +60,7 @@
|
| #include "chrome/browser/chromeos/power/idle_action_warning_observer.h"
|
| #include "chrome/browser/chromeos/power/peripheral_battery_observer.h"
|
| #include "chrome/browser/chromeos/power/power_button_observer.h"
|
| +#include "chrome/browser/chromeos/power/power_prefs.h"
|
| #include "chrome/browser/chromeos/power/resume_observer.h"
|
| #include "chrome/browser/chromeos/power/screen_lock_observer.h"
|
| #include "chrome/browser/chromeos/power/suspend_observer.h"
|
| @@ -98,6 +99,7 @@
|
| #include "chromeos/cryptohome/async_method_caller.h"
|
| #include "chromeos/cryptohome/cryptohome_library.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| +#include "chromeos/dbus/power_policy_controller.h"
|
| #include "chromeos/dbus/session_manager_client.h"
|
| #include "chromeos/disks/disk_mount_manager.h"
|
| #include "chromeos/ime/input_method_manager.h"
|
| @@ -587,6 +589,9 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
|
| WizardController::SetZeroDelays();
|
| }
|
|
|
| + power_prefs_.reset(new PowerPrefs(
|
| + DBusThreadManager::Get()->GetPowerPolicyController()));
|
| +
|
| // In Aura builds this will initialize ash::Shell.
|
| ChromeBrowserMainPartsLinux::PreProfileInit();
|
| }
|
| @@ -780,6 +785,7 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
|
| brightness_observer_.reset();
|
| retail_mode_power_save_blocker_.reset();
|
| peripheral_battery_observer_.reset();
|
| + power_prefs_.reset();
|
|
|
| // The XInput2 event listener needs to be shut down earlier than when
|
| // Singletons are finally destroyed in AtExitManager.
|
|
|