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

Side by Side Diff: chrome/nacl/nacl_main.cc

Issue 18063004: Move timing files into base/time, install forwarding headers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ios Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « chrome/nacl/nacl_exe_win_64.cc ('k') | content/browser/browser_main_loop.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
9 #include "base/message_loop.h" 8 #include "base/message_loop.h"
10 #include "base/power_monitor/power_monitor.h" 9 #include "base/power_monitor/power_monitor.h"
10 #include "base/timer/hi_res_timer_manager.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/content_switches.h" 16 #include "content/public/common/content_switches.h"
17 #include "content/public/common/main_function_params.h" 17 #include "content/public/common/main_function_params.h"
18 18
19 // main() routine for the NaCl loader process. 19 // main() routine for the NaCl loader process.
20 int NaClMain(const content::MainFunctionParams& parameters) { 20 int NaClMain(const content::MainFunctionParams& parameters) {
21 const CommandLine& parsed_command_line = parameters.command_line; 21 const CommandLine& parsed_command_line = parameters.command_line;
22 22
23 // The main thread of the plugin services IO. 23 // The main thread of the plugin services IO.
24 base::MessageLoopForIO main_message_loop; 24 base::MessageLoopForIO main_message_loop;
25 base::PlatformThread::SetName("CrNaClMain"); 25 base::PlatformThread::SetName("CrNaClMain");
26 26
27 base::PowerMonitor power_monitor; 27 base::PowerMonitor power_monitor;
28 HighResolutionTimerManager hi_res_timer_manager; 28 base::HighResolutionTimerManager hi_res_timer_manager;
29 29
30 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) 30 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
31 NaClMainPlatformDelegate platform(parameters); 31 NaClMainPlatformDelegate platform(parameters);
32 32
33 platform.PlatformInitialize(); 33 platform.PlatformInitialize();
34 bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox); 34 bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox);
35 platform.InitSandboxTests(no_sandbox); 35 platform.InitSandboxTests(no_sandbox);
36 36
37 #if defined(OS_POSIX) 37 #if defined(OS_POSIX)
38 // The number of cores must be obtained before the invocation of 38 // The number of cores must be obtained before the invocation of
(...skipping 19 matching lines...) Expand all
58 // require waiting for a timeout. 58 // require waiting for a timeout.
59 VLOG(1) << "Sandbox test failed: Not launching NaCl process"; 59 VLOG(1) << "Sandbox test failed: Not launching NaCl process";
60 } 60 }
61 #else 61 #else
62 NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc."; 62 NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc.";
63 #endif 63 #endif
64 64
65 platform.PlatformUninitialize(); 65 platform.PlatformUninitialize();
66 return 0; 66 return 0;
67 } 67 }
OLDNEW
« no previous file with comments | « chrome/nacl/nacl_exe_win_64.cc ('k') | content/browser/browser_main_loop.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698