components/nacl/loader/nacl_main.cc - Issue 16881004: Move chrome/nacl to components/nacl.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

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: Create a zygote folder 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

« no previous file with comments | « components/nacl/loader/nacl_listener.cc ('k') | components/nacl/loader/nacl_main_platform_delegate.h » ('j') | no next file with comments »

OLD	NEW
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/loader/nacl_listener.h"

12 #include "chrome/common/chrome_switches.h"	12 #include "components/nacl/loader/nacl_main_platform_delegate.h"

13 #include "chrome/common/logging_chrome.h"

14 #include "chrome/nacl/nacl_listener.h"

15 #include "chrome/nacl/nacl_main_platform_delegate.h"

16 #include "content/public/common/content_switches.h"	13 #include "content/public/common/content_switches.h"

17 #include "content/public/common/main_function_params.h"	14 #include "content/public/common/main_function_params.h"

18	15

19 // main() routine for the NaCl loader process.	16 // main() routine for the NaCl loader process.

20 int NaClMain(const content::MainFunctionParams& parameters) {	17 int NaClMain(const content::MainFunctionParams& parameters) {

21 const CommandLine& parsed_command_line = parameters.command_line;	18 const CommandLine& parsed_command_line = parameters.command_line;

22	19

23 // The main thread of the plugin services IO.	20 // The main thread of the plugin services IO.

24 base::MessageLoopForIO main_message_loop;	21 base::MessageLoopForIO main_message_loop;

25 base::PlatformThread::SetName("CrNaClMain");	22 base::PlatformThread::SetName("CrNaClMain");

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
58 // require waiting for a timeout.	55 // require waiting for a timeout.

59 VLOG(1) << "Sandbox test failed: Not launching NaCl process";	56 VLOG(1) << "Sandbox test failed: Not launching NaCl process";

60 }	57 }

61 #else	58 #else

62 NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc.";	59 NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc.";

63 #endif	60 #endif

64	61

65 platform.PlatformUninitialize();	62 platform.PlatformUninitialize();

66 return 0;	63 return 0;

67 }	64 }

OLD	NEW