chrome/browser/chromeos/chrome_browser_main_chromeos.cc - Issue 13638018: Add PeripheralBatteryObserver

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 13638018: Add PeripheralBatteryObserver (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: browser tests added Created 7 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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 ecf74e8ba74577ec73c4b906d537c36864f319e2..ed96e248874f92a75875837b5bd2e7e2e5826009 100644

--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

@@ -57,6 +57,7 @@

#include "chrome/browser/chromeos/net/network_portal_detector.h"

#include "chrome/browser/chromeos/power/brightness_observer.h"

#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/resume_observer.h"

#include "chrome/browser/chromeos/power/screen_lock_observer.h"

@@ -373,6 +374,9 @@ ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() {

if (KioskModeSettings::Get()->IsKioskModeEnabled())

ShutdownKioskModeScreensaver();

+ // PeripheralBatteryObserver needs to be destroyed before DBusServices.

+ // So release it explicitly here before DBusServices reset.

+ peripheral_battery_observer_.reset();

Daniel Erat 2013/04/10 12:58:21 can this be moved to line 748, where the other dbu

Yufeng Shen (Slow to review) 2013/04/10 18:13:46 Done.

dbus_services_.reset();

// To be precise, logout (browser shutdown) is not yet done, but the

@@ -443,6 +447,9 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {

message_loop->AddObserver(g_message_loop_observer.Pointer());

dbus_services_.reset(new internal::DBusServices(parameters()));

+ // PeripheralBatteryObserver is relying on DBusServices. So initialize it

+ // after DBusServices' initialization.

+ peripheral_battery_observer_.reset(new PeripheralBatteryObserver());

Daniel Erat 2013/04/10 12:58:21 move to line 641? it's better to wait as long as

Yufeng Shen (Slow to review) 2013/04/10 18:13:46 Done.

ChromeBrowserMainPartsLinux::PostMainMessageLoopStart();

}