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 /content/browser/loader/resource_request_info_impl.h | |
| 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 'content/browser/loader/resource_request_info_impl.h')
| -rw-r--r-- | content/browser/loader/resource_request_info_impl.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/content/browser/loader/resource_request_info_impl.h b/content/browser/loader/resource_request_info_impl.h index bf0c6b9..f558203 100644 --- a/content/browser/loader/resource_request_info_impl.h +++ b/content/browser/loader/resource_request_info_impl.h @@ -12,7 +12,6 @@ #include "base/memory/scoped_ptr.h" #include "base/supports_user_data.h" #include "content/public/browser/resource_request_info.h" -#include "content/public/common/process_type.h" #include "content/public/common/referrer.h" #include "net/base/load_states.h" #include "webkit/glue/resource_type.h" @@ -40,7 +39,7 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo, const net::URLRequest* request); CONTENT_EXPORT ResourceRequestInfoImpl( - ProcessType process_type, + int process_type, int child_id, int route_id, int origin_pid, @@ -93,9 +92,7 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo, } // Identifies the type of process (renderer, plugin, etc.) making the request. - ProcessType process_type() const { - return process_type_; - } + int process_type() const { return process_type_; } // Downloads are allowed only as a top level request. bool allow_download() const { return allow_download_; } @@ -128,7 +125,7 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo, // Non-owning, may be NULL. CrossSiteResourceHandler* cross_site_handler_; - ProcessType process_type_; + int process_type_; int child_id_; int route_id_; int origin_pid_; |