diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-26 03:36:58 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-26 03:36:58 +0000 |
| commit | 4654bfe33256021b07fa4b9518e28e3e937ae39d (patch) | |
| tree | 4370202ffad7545e22ea75934a85ec9a5a5e7a18 /chrome_frame | |
| parent | d474bf8ae4d09569fccefd06d35e0e4e98745e43 (diff) | |
| download | chromium_src-4654bfe33256021b07fa4b9518e28e3e937ae39d.zip chromium_src-4654bfe33256021b07fa4b9518e28e3e937ae39d.tar.gz chromium_src-4654bfe33256021b07fa4b9518e28e3e937ae39d.tar.bz2 | |
content: Move kHttpsScheme constant into content namespace.
BUG=None
TBR=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/23112033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219495 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/navigation_constraints.cc | 5 | ||||
| -rw-r--r-- | chrome_frame/utils.cc | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/chrome_frame/navigation_constraints.cc b/chrome_frame/navigation_constraints.cc index 33f4216..92524e4 100644 --- a/chrome_frame/navigation_constraints.cc +++ b/chrome_frame/navigation_constraints.cc @@ -26,8 +26,7 @@ bool NavigationConstraintsImpl::IsSchemeAllowed(const GURL& url) { if (!url.is_valid()) return false; - if (url.SchemeIs(chrome::kHttpScheme) || - url.SchemeIs(chrome::kHttpsScheme)) + if (url.SchemeIs(chrome::kHttpScheme) || url.SchemeIs(content::kHttpsScheme)) return true; // Additional checking for view-source. Allow only http and https @@ -35,7 +34,7 @@ bool NavigationConstraintsImpl::IsSchemeAllowed(const GURL& url) { if (url.SchemeIs(content::kViewSourceScheme)) { GURL sub_url(url.path()); if (sub_url.SchemeIs(chrome::kHttpScheme) || - sub_url.SchemeIs(chrome::kHttpsScheme)) + sub_url.SchemeIs(content::kHttpsScheme)) return true; } diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc index 02101ed..940ab1f 100644 --- a/chrome_frame/utils.cc +++ b/chrome_frame/utils.cc @@ -1002,7 +1002,7 @@ bool IsValidUrlScheme(const GURL& url, bool is_privileged) { return false; if (url.SchemeIs(chrome::kHttpScheme) || - url.SchemeIs(chrome::kHttpsScheme) || + url.SchemeIs(content::kHttpsScheme) || url.SchemeIs(chrome::kAboutScheme)) return true; @@ -1011,7 +1011,7 @@ bool IsValidUrlScheme(const GURL& url, bool is_privileged) { if (url.SchemeIs(content::kViewSourceScheme)) { GURL sub_url(url.path()); if (sub_url.SchemeIs(chrome::kHttpScheme) || - sub_url.SchemeIs(chrome::kHttpsScheme)) + sub_url.SchemeIs(content::kHttpsScheme)) return true; else return false; |