diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-22 05:16:13 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-22 05:16:13 +0000 |
| commit | f3b3576935e25d8d4e6c244740a06a36b9dc9f8e (patch) | |
| tree | a5e44168dc6631d47c58e1b9c6008e236581bcbe /chrome/browser/nacl_host/nacl_process_host.cc | |
| parent | 0c472954a32a68e6d6cc7be6eb53b6b9e99b66d6 (diff) | |
| download | chromium_src-f3b3576935e25d8d4e6c244740a06a36b9dc9f8e.zip chromium_src-f3b3576935e25d8d4e6c244740a06a36b9dc9f8e.tar.gz chromium_src-f3b3576935e25d8d4e6c244740a06a36b9dc9f8e.tar.bz2 | |
Split the ProcessType enum into process types that content knows about (which will remain in src\content) and those that are for chrome (which moved to src\chrome). This way we won't get any more layering violations where nacl code is in content.
Also move the NaCl command line switches to chrome.
BUG=191682
Review URL: https://codereview.chromium.org/12662019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189763 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/nacl_host/nacl_process_host.cc')
| -rw-r--r-- | chrome/browser/nacl_host/nacl_process_host.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc index c7faa47..dbb03e1 100644 --- a/chrome/browser/nacl_host/nacl_process_host.cc +++ b/chrome/browser/nacl_host/nacl_process_host.cc @@ -27,6 +27,7 @@ #include "chrome/browser/renderer_host/chrome_render_message_filter.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" +#include "chrome/common/chrome_process_type.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/logging_chrome.h" @@ -202,7 +203,7 @@ NaClProcessHost::NaClProcessHost(const GURL& manifest_url, ALLOW_THIS_IN_INITIALIZER_LIST(ipc_plugin_listener_(this)), render_view_id_(render_view_id) { process_.reset(content::BrowserChildProcessHost::Create( - content::PROCESS_TYPE_NACL_LOADER, this)); + PROCESS_TYPE_NACL_LOADER, this)); // Set the display name so the user knows what plugin the process is running. // We aren't on the UI thread so getting the pref locale for language @@ -821,7 +822,7 @@ void NaClProcessHost::OnPpapiChannelCreated( // If the proxy channel is null, this must be the initial NaCl-Browser IPC // channel. if (!ipc_proxy_channel_.get()) { - DCHECK_EQ(content::PROCESS_TYPE_NACL_LOADER, process_->GetData().type); + DCHECK_EQ(PROCESS_TYPE_NACL_LOADER, process_->GetData().process_type); ipc_proxy_channel_.reset( new IPC::ChannelProxy(channel_handle, |