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

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

Issue 16867015: Revert r207951 - "Separate NaCl switches to their own file." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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') | chrome/nacl/nacl_main_platform_delegate_mac.mm » ('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" 8 #include "base/hi_res_timer_manager.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/power_monitor/power_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/content_switches.h"
17 #include "content/public/common/main_function_params.h" 16 #include "content/public/common/main_function_params.h"
18 17
19 // main() routine for the NaCl loader process. 18 // main() routine for the NaCl loader process.
20 int NaClMain(const content::MainFunctionParams& parameters) { 19 int NaClMain(const content::MainFunctionParams& parameters) {
21 const CommandLine& parsed_command_line = parameters.command_line; 20 const CommandLine& parsed_command_line = parameters.command_line;
22 21
23 // The main thread of the plugin services IO. 22 // The main thread of the plugin services IO.
24 base::MessageLoopForIO main_message_loop; 23 base::MessageLoopForIO main_message_loop;
25 base::PlatformThread::SetName("CrNaClMain"); 24 base::PlatformThread::SetName("CrNaClMain");
26 25
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 // require waiting for a timeout. 57 // require waiting for a timeout.
59 VLOG(1) << "Sandbox test failed: Not launching NaCl process"; 58 VLOG(1) << "Sandbox test failed: Not launching NaCl process";
60 } 59 }
61 #else 60 #else
62 NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc."; 61 NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc.";
63 #endif 62 #endif
64 63
65 platform.PlatformUninitialize(); 64 platform.PlatformUninitialize();
66 return 0; 65 return 0;
67 } 66 }
OLDNEW
« no previous file with comments | « chrome/nacl/nacl_exe_win_64.cc ('k') | chrome/nacl/nacl_main_platform_delegate_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698