diff options
Diffstat (limited to 'chrome/browser/extensions/api')
4 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc b/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc index 537d08f..133e330 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc +++ b/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc @@ -45,7 +45,7 @@ COMPILE_ASSERT(arraysize(kContentSettingNames) <= std::string GetDefaultPort(const std::string& scheme) { if (scheme == chrome::kHttpScheme) return "80"; - if (scheme == chrome::kHttpsScheme) + if (scheme == content::kHttpsScheme) return "443"; NOTREACHED(); return std::string(); diff --git a/chrome/browser/extensions/api/cookies/cookies_helpers.cc b/chrome/browser/extensions/api/cookies/cookies_helpers.cc index b68146b..2d3e67e 100644 --- a/chrome/browser/extensions/api/cookies/cookies_helpers.cc +++ b/chrome/browser/extensions/api/cookies/cookies_helpers.cc @@ -119,7 +119,7 @@ void GetCookieListFromStore( GURL GetURLFromCanonicalCookie(const net::CanonicalCookie& cookie) { const std::string& domain_key = cookie.Domain(); const std::string scheme = - cookie.IsSecure() ? chrome::kHttpsScheme : chrome::kHttpScheme; + cookie.IsSecure() ? content::kHttpsScheme : chrome::kHttpScheme; const std::string host = domain_key.find('.') != 0 ? domain_key : domain_key.substr(1); return GURL(scheme + content::kStandardSchemeSeparator + host + "/"); diff --git a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc index 11092cb..8df798b 100644 --- a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc +++ b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc @@ -16,7 +16,7 @@ namespace { const char* kValidSchemes[] = { chrome::kChromeUIScheme, chrome::kHttpScheme, - chrome::kHttpsScheme, + content::kHttpsScheme, chrome::kFileScheme, chrome::kFtpScheme, content::kJavaScriptScheme, diff --git a/chrome/browser/extensions/api/web_request/web_request_permissions.cc b/chrome/browser/extensions/api/web_request/web_request_permissions.cc index 480bf84..4bad267 100644 --- a/chrome/browser/extensions/api/web_request/web_request_permissions.cc +++ b/chrome/browser/extensions/api/web_request/web_request_permissions.cc @@ -71,7 +71,7 @@ bool HasWebRequestScheme(const GURL& url) { url.SchemeIs(chrome::kFileSystemScheme) || url.SchemeIs(chrome::kFtpScheme) || url.SchemeIs(chrome::kHttpScheme) || - url.SchemeIs(chrome::kHttpsScheme) || + url.SchemeIs(content::kHttpsScheme) || url.SchemeIs(extensions::kExtensionScheme)); } |