chrome/nacl/nacl_exe_win_64.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: chrome/nacl/nacl_exe_win_64.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 | « chrome/nacl/nacl_broker_listener.cc ('k') | chrome/nacl/nacl_helper_linux.cc » ('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 "base/at_exit.h"	5 #include "base/at_exit.h"

6 #include "base/command_line.h"	6 #include "base/command_line.h"

7 #include "base/hi_res_timer_manager.h"	7 #include "base/hi_res_timer_manager.h"

8 #include "base/logging.h"	8 #include "base/logging.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 "base/process_util.h"	11 #include "base/process_util.h"

12 #include "base/strings/string_util.h"	12 #include "base/strings/string_util.h"

13 #include "chrome/app/breakpad_win.h"	13 #include "chrome/app/breakpad_win.h"

14 #include "chrome/common/chrome_result_codes.h"	14 #include "components/nacl/broker/nacl_broker_listener.h"

15 #include "chrome/common/logging_chrome.h"	15 #include "components/nacl/common/nacl_cmd_line.h"

16 #include "chrome/nacl/nacl_broker_listener.h"

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

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

19 #include "components/nacl/common/nacl_switches.h"	16 #include "components/nacl/common/nacl_switches.h"

	17 #include "components/nacl/loader/nacl_listener.h"

	18 #include "components/nacl/loader/nacl_main_platform_delegate.h"

20 #include "content/public/app/startup_helper_win.h"	19 #include "content/public/app/startup_helper_win.h"

21 #include "content/public/common/content_switches.h"	20 #include "content/public/common/content_switches.h"

22 #include "content/public/common/main_function_params.h"	21 #include "content/public/common/main_function_params.h"

23 #include "content/public/common/sandbox_init.h"	22 #include "content/public/common/sandbox_init.h"

24 #include "sandbox/win/src/sandbox_types.h"	23 #include "sandbox/win/src/sandbox_types.h"

25	24

26 extern int NaClMain(const content::MainFunctionParams&);	25 extern int NaClMain(const content::MainFunctionParams&);

27	26

28 // main() routine for the NaCl broker process.	27 // main() routine for the NaCl broker process.

29 // This is necessary for supporting NaCl in Chrome on Win64.	28 // This is necessary for supporting NaCl in Chrome on Win64.

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
74	73

75 if (process_type == switches::kNaClLoaderProcess)	74 if (process_type == switches::kNaClLoaderProcess)

76 return NaClMain(main_params);	75 return NaClMain(main_params);

77	76

78 if (process_type == switches::kNaClBrokerProcess)	77 if (process_type == switches::kNaClBrokerProcess)

79 return NaClBrokerMain(main_params);	78 return NaClBrokerMain(main_params);

80	79

81 CHECK(false) << "Unknown NaCl 64 process.";	80 CHECK(false) << "Unknown NaCl 64 process.";

82 return -1;	81 return -1;

83 }	82 }

OLD	NEW