Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(677)

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: make a fake kNotificationOriginUrl to make origin check in notification manager happy 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:
View side-by-side diff with in-line comments
Download patch
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 d3acb3a2d80722c2241e15daed35e16b05916c0f..8c6c20f7fd17b31548d0465e9bebfd9be02449c4 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -56,6 +56,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"
@@ -634,6 +635,8 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
}
chromeos::accessibility::Initialize();
+ peripheral_battery_observer_.reset(new PeripheralBatteryObserver());
+
storage_monitor_->Init();
// Initialize the network portal detector for Chrome OS. The network
@@ -738,6 +741,7 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
resume_observer_.reset();
brightness_observer_.reset();
retail_mode_power_save_blocker_.reset();
+ peripheral_battery_observer_.reset();
// The XInput2 event listener needs to be shut down earlier than when
// Singletons are finally destroyed in AtExitManager.
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.h ('k') | chrome/browser/chromeos/power/peripheral_battery_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698