chrome/browser/nacl_host/nacl_process_host.cc - Issue 15957008: Move NaCl related switches to their own file.

Side by Side Diff: chrome/browser/nacl_host/nacl_process_host.cc

Issue 15957008: Move NaCl related switches to their own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« no previous file with comments | « chrome/browser/content_settings/content_settings_browsertest.cc ('k') | chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc » ('j') | chrome/nacl/nacl_switches.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "chrome/browser/nacl_host/nacl_process_host.h"	5 #include "chrome/browser/nacl_host/nacl_process_host.h"

6	6

7 #include <string>	7 #include <string>

8 #include <vector>	8 #include <vector>

9	9

10 #include "base/base_switches.h"	10 #include "base/base_switches.h"

(...skipping 11 matching lines...) Expand all Loading...
22 #include "base/utf_string_conversions.h"	22 #include "base/utf_string_conversions.h"

23 #include "base/win/windows_version.h"	23 #include "base/win/windows_version.h"

24 #include "build/build_config.h"	24 #include "build/build_config.h"

25 #include "chrome/browser/extensions/extension_info_map.h"	25 #include "chrome/browser/extensions/extension_info_map.h"

26 #include "chrome/browser/nacl_host/nacl_browser.h"	26 #include "chrome/browser/nacl_host/nacl_browser.h"

27 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"	27 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"

28 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h"	28 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h"

29 #include "chrome/common/chrome_constants.h"	29 #include "chrome/common/chrome_constants.h"

30 #include "chrome/common/chrome_paths.h"	30 #include "chrome/common/chrome_paths.h"

31 #include "chrome/common/chrome_process_type.h"	31 #include "chrome/common/chrome_process_type.h"

32 #include "chrome/common/chrome_switches.h"

33 #include "chrome/common/chrome_version_info.h"	32 #include "chrome/common/chrome_version_info.h"

34 #include "chrome/common/logging_chrome.h"	33 #include "chrome/common/logging_chrome.h"

35 #include "chrome/common/nacl_cmd_line.h"	34 #include "chrome/common/nacl_cmd_line.h"

36 #include "chrome/common/nacl_messages.h"	35 #include "chrome/common/nacl_messages.h"

37 #include "chrome/common/render_messages.h"	36 #include "chrome/common/render_messages.h"

	37 #include "chrome/nacl/nacl_switches.h"

38 #include "content/public/browser/browser_child_process_host.h"	38 #include "content/public/browser/browser_child_process_host.h"

39 #include "content/public/browser/browser_ppapi_host.h"	39 #include "content/public/browser/browser_ppapi_host.h"

40 #include "content/public/browser/child_process_data.h"	40 #include "content/public/browser/child_process_data.h"

41 #include "content/public/common/child_process_host.h"	41 #include "content/public/common/child_process_host.h"

42 #include "content/public/common/process_type.h"	42 #include "content/public/common/process_type.h"

43 #include "extensions/common/constants.h"	43 #include "extensions/common/constants.h"

44 #include "ipc/ipc_channel.h"	44 #include "ipc/ipc_channel.h"

45 #include "ipc/ipc_switches.h"	45 #include "ipc/ipc_switches.h"

46 #include "native_client/src/shared/imc/nacl_imc_c.h"	46 #include "native_client/src/shared/imc/nacl_imc_c.h"

47 #include "net/base/net_util.h"	47 #include "net/base/net_util.h"

(...skipping 1020 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1068 } else {	1068 } else {

1069 NaClStartDebugExceptionHandlerThread(	1069 NaClStartDebugExceptionHandlerThread(

1070 process_handle.Take(), info,	1070 process_handle.Take(), info,

1071 base::MessageLoopProxy::current(),	1071 base::MessageLoopProxy::current(),

1072 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,	1072 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,

1073 weak_factory_.GetWeakPtr()));	1073 weak_factory_.GetWeakPtr()));

1074 return true;	1074 return true;

1075 }	1075 }

1076 }	1076 }

1077 #endif	1077 #endif

OLD	NEW