content/plugin/plugin_main.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/plugin/plugin_main.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: Use PowerMonitor instead of SystemMonitor in XXXMain function Created 7 years, 9 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

« chrome/browser/profiles/profile_manager_unittest.cc ('K') | « content/browser/gamepad/gamepad_test_helpers.cc ('k') | content/public/test/browser_test_base.cc » ('j') | net/url_request/url_request_job.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/plugin/plugin_main.cc

diff --git a/content/plugin/plugin_main.cc b/content/plugin/plugin_main.cc

index 971e308c6140ba3d123086b30711f5ecf21935ce..2f0817ef830472190a9eaa9755e6dd0f507d3836 100644

--- a/content/plugin/plugin_main.cc

+++ b/content/plugin/plugin_main.cc

@@ -13,7 +13,7 @@

#include "base/hi_res_timer_manager.h"

#include "base/message_loop.h"

#include "base/string_util.h"

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

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

#include "base/threading/platform_thread.h"

#include "content/common/child_process.h"

#include "content/plugin/plugin_thread.h"

@@ -55,7 +55,7 @@ int PluginMain(const MainFunctionParams& parameters) {

MessageLoop main_message_loop(MessageLoop::TYPE_UI);

base::PlatformThread::SetName("CrPluginMain");

- base::SystemMonitor system_monitor;

+ base::PowerMonitor power_monitor;

HighResolutionTimerManager high_resolution_timer_manager;

const CommandLine& parsed_command_line = parameters.command_line;