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

Unified Diff: extensions/common/url_pattern.cc

Issue 254763005: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolve a merge conflict. Created 6 years, 7 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 | « content/renderer/render_frame_impl.cc ('k') | extensions/renderer/dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/url_pattern.cc
diff --git a/extensions/common/url_pattern.cc b/extensions/common/url_pattern.cc
index fc7efbf4f2876b809dfd4ff0546ef32553ae7c0c..020be3c40dfb4b64cab952257bc90cfddcc9271e 100644
--- a/extensions/common/url_pattern.cc
+++ b/extensions/common/url_pattern.cc
@@ -20,13 +20,13 @@ namespace {
// TODO(aa): What about more obscure schemes like data: and javascript: ?
// Note: keep this array in sync with kValidSchemeMasks.
const char* kValidSchemes[] = {
- content::kHttpScheme,
- content::kHttpsScheme,
- content::kFileScheme,
- content::kFtpScheme,
- content::kChromeUIScheme,
- extensions::kExtensionScheme,
- content::kFileSystemScheme,
+ url::kHttpScheme,
+ url::kHttpsScheme,
+ content::kFileScheme,
+ content::kFtpScheme,
+ content::kChromeUIScheme,
+ extensions::kExtensionScheme,
+ content::kFileSystemScheme,
};
const int kValidSchemeMasks[] = {
@@ -365,7 +365,7 @@ bool URLPattern::MatchesScheme(const std::string& test) const {
}
bool URLPattern::MatchesHost(const std::string& host) const {
- std::string test(content::kHttpScheme);
+ std::string test(url::kHttpScheme);
test += content::kStandardSchemeSeparator;
test += host;
test += "/";
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | extensions/renderer/dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698