diff options
| author | yael.aharon@intel.com <yael.aharon@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 23:17:52 +0000 |
|---|---|---|
| committer | yael.aharon@intel.com <yael.aharon@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 23:17:52 +0000 |
| commit | d2e2ccf29df48310fbffb3b9d38463872bd28d17 (patch) | |
| tree | 402d66dea9e363d2b99993aca326bf17b46944ea /chrome/nacl | |
| parent | 30a0d4c9ac288cb5a63a6ccb0c430b2cb1f3739c (diff) | |
| download | chromium_src-d2e2ccf29df48310fbffb3b9d38463872bd28d17.zip chromium_src-d2e2ccf29df48310fbffb3b9d38463872bd28d17.tar.gz chromium_src-d2e2ccf29df48310fbffb3b9d38463872bd28d17.tar.bz2 | |
Separate NaCl switches to their own file.
This is part of an effort to componentize NaCl code.
BUG=244791
Review URL: https://chromiumcodereview.appspot.com/17379019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207951 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl')
| -rw-r--r-- | chrome/nacl/DEPS | 1 | ||||
| -rw-r--r-- | chrome/nacl/nacl_broker_listener.cc | 2 | ||||
| -rw-r--r-- | chrome/nacl/nacl_exe_win_64.cc | 3 | ||||
| -rw-r--r-- | chrome/nacl/nacl_main.cc | 1 | ||||
| -rw-r--r-- | chrome/nacl/nacl_main_platform_delegate_mac.mm | 2 | ||||
| -rw-r--r-- | chrome/nacl/nacl_main_platform_delegate_win.cc | 2 |
6 files changed, 8 insertions, 3 deletions
diff --git a/chrome/nacl/DEPS b/chrome/nacl/DEPS index a3d7040..c5a003d 100644 --- a/chrome/nacl/DEPS +++ b/chrome/nacl/DEPS @@ -1,5 +1,6 @@ include_rules = [ "+chrome/app/breakpad_win.h", + "+components/nacl", "+content/public/app/startup_helper_win.h", "+sandbox/linux/seccomp-bpf", "+sandbox/linux/services", diff --git a/chrome/nacl/nacl_broker_listener.cc b/chrome/nacl/nacl_broker_listener.cc index e310dfe..1a49a1f 100644 --- a/chrome/nacl/nacl_broker_listener.cc +++ b/chrome/nacl/nacl_broker_listener.cc @@ -15,6 +15,8 @@ #include "chrome/common/nacl_cmd_line.h" #include "chrome/common/nacl_debug_exception_handler_win.h" #include "chrome/common/nacl_messages.h" +#include "components/nacl/common/nacl_switches.h" +#include "content/public/common/content_switches.h" #include "content/public/common/sandbox_init.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_switches.h" diff --git a/chrome/nacl/nacl_exe_win_64.cc b/chrome/nacl/nacl_exe_win_64.cc index 7ba3c40..5201315 100644 --- a/chrome/nacl/nacl_exe_win_64.cc +++ b/chrome/nacl/nacl_exe_win_64.cc @@ -12,12 +12,13 @@ #include "base/strings/string_util.h" #include "chrome/app/breakpad_win.h" #include "chrome/common/chrome_result_codes.h" -#include "chrome/common/chrome_switches.h" #include "chrome/common/logging_chrome.h" #include "chrome/nacl/nacl_broker_listener.h" #include "chrome/nacl/nacl_listener.h" #include "chrome/nacl/nacl_main_platform_delegate.h" +#include "components/nacl/common/nacl_switches.h" #include "content/public/app/startup_helper_win.h" +#include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" #include "content/public/common/sandbox_init.h" #include "sandbox/win/src/sandbox_types.h" diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc index 112a9c4..21b4aa3 100644 --- a/chrome/nacl/nacl_main.cc +++ b/chrome/nacl/nacl_main.cc @@ -13,6 +13,7 @@ #include "chrome/common/logging_chrome.h" #include "chrome/nacl/nacl_listener.h" #include "chrome/nacl/nacl_main_platform_delegate.h" +#include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" // main() routine for the NaCl loader process. diff --git a/chrome/nacl/nacl_main_platform_delegate_mac.mm b/chrome/nacl/nacl_main_platform_delegate_mac.mm index e304ea7..2b094b1 100644 --- a/chrome/nacl/nacl_main_platform_delegate_mac.mm +++ b/chrome/nacl/nacl_main_platform_delegate_mac.mm @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/native_library.h" #include "chrome/common/chrome_sandbox_type_mac.h" -#include "chrome/common/chrome_switches.h" +#include "components/nacl/common/nacl_switches.h" #include "content/public/common/sandbox_init.h" NaClMainPlatformDelegate::NaClMainPlatformDelegate( diff --git a/chrome/nacl/nacl_main_platform_delegate_win.cc b/chrome/nacl/nacl_main_platform_delegate_win.cc index abd9b3e..be37857 100644 --- a/chrome/nacl/nacl_main_platform_delegate_win.cc +++ b/chrome/nacl/nacl_main_platform_delegate_win.cc @@ -8,7 +8,7 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/native_library.h" -#include "chrome/common/chrome_switches.h" +#include "components/nacl/common/nacl_switches.h" #include "sandbox/win/src/sandbox.h" NaClMainPlatformDelegate::NaClMainPlatformDelegate( |