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

Side by Side Diff: chrome/nacl/nacl_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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/hi_res_timer_manager.h" 8 #include "base/hi_res_timer_manager.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/system_monitor/system_monitor.h" 10 #include "base/power_monitor/power_monitor.h"
11 #include "chrome/common/chrome_result_codes.h" 11 #include "chrome/common/chrome_result_codes.h"
12 #include "chrome/common/chrome_switches.h" 12 #include "chrome/common/chrome_switches.h"
13 #include "chrome/common/logging_chrome.h" 13 #include "chrome/common/logging_chrome.h"
14 #include "chrome/nacl/nacl_listener.h" 14 #include "chrome/nacl/nacl_listener.h"
15 #include "chrome/nacl/nacl_main_platform_delegate.h" 15 #include "chrome/nacl/nacl_main_platform_delegate.h"
16 #include "content/public/common/main_function_params.h" 16 #include "content/public/common/main_function_params.h"
17 17
18 // main() routine for the NaCl loader process. 18 // main() routine for the NaCl loader process.
19 int NaClMain(const content::MainFunctionParams& parameters) { 19 int NaClMain(const content::MainFunctionParams& parameters) {
20 const CommandLine& parsed_command_line = parameters.command_line; 20 const CommandLine& parsed_command_line = parameters.command_line;
21 21
22 // The main thread of the plugin services IO. 22 // The main thread of the plugin services IO.
23 MessageLoopForIO main_message_loop; 23 MessageLoopForIO main_message_loop;
24 base::PlatformThread::SetName("CrNaClMain"); 24 base::PlatformThread::SetName("CrNaClMain");
25 25
26 base::SystemMonitor system_monitor; 26 base::PowerMonitor power_monitor;
27 HighResolutionTimerManager hi_res_timer_manager; 27 HighResolutionTimerManager hi_res_timer_manager;
28 28
29 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) 29 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
30 NaClMainPlatformDelegate platform(parameters); 30 NaClMainPlatformDelegate platform(parameters);
31 31
32 platform.PlatformInitialize(); 32 platform.PlatformInitialize();
33 bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox); 33 bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox);
34 platform.InitSandboxTests(no_sandbox); 34 platform.InitSandboxTests(no_sandbox);
35 35
36 if (!no_sandbox) { 36 if (!no_sandbox) {
(...skipping 11 matching lines...) Expand all
48 // require waiting for a timeout. 48 // require waiting for a timeout.
49 VLOG(1) << "Sandbox test failed: Not launching NaCl process"; 49 VLOG(1) << "Sandbox test failed: Not launching NaCl process";
50 } 50 }
51 #else 51 #else
52 NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc."; 52 NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc.";
53 #endif 53 #endif
54 54
55 platform.PlatformUninitialize(); 55 platform.PlatformUninitialize();
56 return 0; 56 return 0;
57 } 57 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698