Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1102)

Unified Diff: chrome/browser/search/search.cc

Issue 23112033: content: Move kHttpsScheme constant into content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/safe_browsing/database_manager.cc ('k') | chrome/browser/search_engines/template_url.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/search/search.cc
diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
index f42fafb8bb16758cbd8114180e33f75ec0fe532a..17b7854dff660a79ab10acf4392813f29bb4c147 100644
--- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc
@@ -140,7 +140,7 @@ bool MatchesOrigin(const GURL& my_url, const GURL& other_url) {
return my_url.host() == other_url.host() &&
my_url.port() == other_url.port() &&
(my_url.scheme() == other_url.scheme() ||
- (my_url.SchemeIs(chrome::kHttpsScheme) &&
+ (my_url.SchemeIs(content::kHttpsScheme) &&
other_url.SchemeIs(chrome::kHttpScheme)));
}
@@ -430,7 +430,7 @@ GURL GetInstantURL(Profile* profile, int start_margin) {
google_util::StartsWithCommandLineGoogleBaseURL(instant_url))
return instant_url;
GURL::Replacements replacements;
- const std::string secure_scheme(chrome::kHttpsScheme);
+ const std::string secure_scheme(content::kHttpsScheme);
replacements.SetSchemeStr(secure_scheme);
return instant_url.ReplaceComponents(replacements);
}
« no previous file with comments | « chrome/browser/safe_browsing/database_manager.cc ('k') | chrome/browser/search_engines/template_url.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698