content/browser/browser_main_loop.cc - Issue 10959020: SystemMonitor refactoring: move power state monitor into a separate class called PowerMonitor

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/browser_main_loop.cc

Issue 10959020: SystemMonitor refactoring: move power state monitor into a separate class called PowerMonitor (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: update Created 8 years, 2 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

« base/power_monitor/power_monitor_unittest.cc ('K') | « content/browser/browser_main_loop.h ('k') | content/browser/gamepad/gamepad_test_helpers.h » ('j') | content/browser/gamepad/gamepad_test_helpers.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/browser_main_loop.cc

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc

index c384ea5fb9fecfc6bba92551e5f121eca509df21..b6b7e06d239db7182d0e22163aa52de55c910fcd 100644

--- a/content/browser/browser_main_loop.cc

+++ b/content/browser/browser_main_loop.cc

@@ -12,6 +12,8 @@

#include "base/message_loop.h"

#include "base/metrics/field_trial.h"

#include "base/metrics/histogram.h"

+#include "base/power_monitor/power_monitor.h"

+#include "base/system_monitor/system_monitor.h"

#include "base/run_loop.h"

#include "base/string_number_conversions.h"

#include "base/threading/thread_restrictions.h"

@@ -330,6 +332,7 @@ void BrowserMainLoop::MainMessageLoopStart() {

InitializeMainThread();

system_monitor_.reset(new base::SystemMonitor);

+ power_monitor_.reset(new base::PowerMonitor);

hi_res_timer_manager_.reset(new HighResolutionTimerManager);

network_change_notifier_.reset(net::NetworkChangeNotifier::Create());

audio_manager_.reset(media::AudioManager::Create());