diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-15 03:38:29 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-15 03:38:29 +0000 |
| commit | e9a82042b509c4f65d1ed04321ef5daafc5c2dd6 (patch) | |
| tree | 9cb15b9066a04bf4f67b509c76acc5a7a080493a /chrome_frame | |
| parent | d454dcbc855465ec505aa99c44128fc3e2bb386b (diff) | |
| download | chromium_src-e9a82042b509c4f65d1ed04321ef5daafc5c2dd6.zip chromium_src-e9a82042b509c4f65d1ed04321ef5daafc5c2dd6.tar.gz chromium_src-e9a82042b509c4f65d1ed04321ef5daafc5c2dd6.tar.bz2 | |
content: Move kHttpScheme constant into content namespace.
BUG=None
TEST=None, no functional change.
TBR=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/23658056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223272 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/navigation_constraints.cc | 4 | ||||
| -rw-r--r-- | chrome_frame/utils.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/navigation_constraints.cc b/chrome_frame/navigation_constraints.cc index 92524e4..59efb0e 100644 --- a/chrome_frame/navigation_constraints.cc +++ b/chrome_frame/navigation_constraints.cc @@ -26,14 +26,14 @@ bool NavigationConstraintsImpl::IsSchemeAllowed(const GURL& url) { if (!url.is_valid()) return false; - if (url.SchemeIs(chrome::kHttpScheme) || url.SchemeIs(content::kHttpsScheme)) + if (url.SchemeIs(content::kHttpScheme) || url.SchemeIs(content::kHttpsScheme)) return true; // Additional checking for view-source. Allow only http and https // URLs in view source. if (url.SchemeIs(content::kViewSourceScheme)) { GURL sub_url(url.path()); - if (sub_url.SchemeIs(chrome::kHttpScheme) || + if (sub_url.SchemeIs(content::kHttpScheme) || sub_url.SchemeIs(content::kHttpsScheme)) return true; } diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc index 940ab1f..7c8b713 100644 --- a/chrome_frame/utils.cc +++ b/chrome_frame/utils.cc @@ -1001,7 +1001,7 @@ bool IsValidUrlScheme(const GURL& url, bool is_privileged) { if (url.is_empty()) return false; - if (url.SchemeIs(chrome::kHttpScheme) || + if (url.SchemeIs(content::kHttpScheme) || url.SchemeIs(content::kHttpsScheme) || url.SchemeIs(chrome::kAboutScheme)) return true; @@ -1010,7 +1010,7 @@ bool IsValidUrlScheme(const GURL& url, bool is_privileged) { // URLs in view source. if (url.SchemeIs(content::kViewSourceScheme)) { GURL sub_url(url.path()); - if (sub_url.SchemeIs(chrome::kHttpScheme) || + if (sub_url.SchemeIs(content::kHttpScheme) || sub_url.SchemeIs(content::kHttpsScheme)) return true; else |