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

Side by Side Diff: components/nacl/loader/nacl_main.cc

Issue 16881004: Move chrome/nacl to components/nacl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Windows build fix 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
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 "components/nacl/common/nacl_delegate.h"
12 #include "chrome/common/chrome_switches.h" 12 #include "components/nacl/loader/nacl_listener.h"
13 #include "chrome/common/logging_chrome.h" 13 #include "components/nacl/loader/nacl_main_platform_delegate.h"
14 #include "chrome/nacl/nacl_listener.h" 14 #include "content/public/common/content_switches.h"
15 #include "chrome/nacl/nacl_main_platform_delegate.h"
16 #include "content/public/common/main_function_params.h" 15 #include "content/public/common/main_function_params.h"
17 16
18 // main() routine for the NaCl loader process. 17 // main() routine for the NaCl loader process.
19 int NaClMain(const content::MainFunctionParams& parameters) { 18 int NaClMain(const content::MainFunctionParams& parameters) {
20 const CommandLine& parsed_command_line = parameters.command_line; 19 const CommandLine& parsed_command_line = parameters.command_line;
21 20
22 // The main thread of the plugin services IO. 21 // The main thread of the plugin services IO.
23 base::MessageLoopForIO main_message_loop; 22 base::MessageLoopForIO main_message_loop;
24 base::PlatformThread::SetName("CrNaClMain"); 23 base::PlatformThread::SetName("CrNaClMain");
25 24
(...skipping 22 matching lines...) Expand all
48 // require waiting for a timeout. 47 // require waiting for a timeout.
49 VLOG(1) << "Sandbox test failed: Not launching NaCl process"; 48 VLOG(1) << "Sandbox test failed: Not launching NaCl process";
50 } 49 }
51 #else 50 #else
52 NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc."; 51 NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc.";
53 #endif 52 #endif
54 53
55 platform.PlatformUninitialize(); 54 platform.PlatformUninitialize();
56 return 0; 55 return 0;
57 } 56 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698