diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-05 19:10:07 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-05 19:10:07 +0000 |
| commit | 7491ad09fcd97ef2341dd5c7df380287f97bd128 (patch) | |
| tree | f5f6fc0a6a4b559877e0b6649a4fe5df2aa8a05f /content/browser/ssl | |
| parent | 63d1f9b9a1fb0e67739fdfe59d4aa5a978bf95ac (diff) | |
| download | chromium_src-7491ad09fcd97ef2341dd5c7df380287f97bd128.zip chromium_src-7491ad09fcd97ef2341dd5c7df380287f97bd128.tar.gz chromium_src-7491ad09fcd97ef2341dd5c7df380287f97bd128.tar.bz2 | |
Move resource_type.* from webkit/ to content/.
Put it in content namespace while doing this.
BUG=338338
TEST=None
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/370833002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/ssl')
| -rw-r--r-- | content/browser/ssl/ssl_error_handler.h | 2 | ||||
| -rw-r--r-- | content/browser/ssl/ssl_policy.cc | 2 | ||||
| -rw-r--r-- | content/browser/ssl/ssl_policy.h | 2 | ||||
| -rw-r--r-- | content/browser/ssl/ssl_request_info.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/ssl/ssl_error_handler.h b/content/browser/ssl/ssl_error_handler.h index 87bc1da..6b0834b 100644 --- a/content/browser/ssl/ssl_error_handler.h +++ b/content/browser/ssl/ssl_error_handler.h @@ -12,8 +12,8 @@ #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" #include "content/public/browser/global_request_id.h" +#include "content/public/common/resource_type.h" #include "url/gurl.h" -#include "webkit/common/resource_type.h" namespace net { class SSLInfo; diff --git a/content/browser/ssl/ssl_policy.cc b/content/browser/ssl/ssl_policy.cc index 7316455..2abee5b 100644 --- a/content/browser/ssl/ssl_policy.cc +++ b/content/browser/ssl/ssl_policy.cc @@ -18,10 +18,10 @@ #include "content/browser/ssl/ssl_request_info.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/content_browser_client.h" +#include "content/public/common/resource_type.h" #include "content/public/common/ssl_status.h" #include "content/public/common/url_constants.h" #include "net/ssl/ssl_info.h" -#include "webkit/common/resource_type.h" namespace content { diff --git a/content/browser/ssl/ssl_policy.h b/content/browser/ssl/ssl_policy.h index c88e10c..64b9c3a 100644 --- a/content/browser/ssl/ssl_policy.h +++ b/content/browser/ssl/ssl_policy.h @@ -8,7 +8,7 @@ #include <string> #include "base/memory/ref_counted.h" -#include "webkit/common/resource_type.h" +#include "content/public/common/resource_type.h" namespace content { class NavigationEntryImpl; diff --git a/content/browser/ssl/ssl_request_info.h b/content/browser/ssl/ssl_request_info.h index cf745fe..9498c89 100644 --- a/content/browser/ssl/ssl_request_info.h +++ b/content/browser/ssl/ssl_request_info.h @@ -8,9 +8,9 @@ #include <string> #include "base/memory/ref_counted.h" +#include "content/public/common/resource_type.h" #include "net/cert/cert_status_flags.h" #include "url/gurl.h" -#include "webkit/common/resource_type.h" namespace content { |