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

Unified Diff: chrome/renderer/content_settings_observer.cc

Issue 273193004: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing files. 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 | « chrome/common/net/url_util.cc ('k') | chrome/renderer/extensions/chrome_extension_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/content_settings_observer.cc
diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc
index 62f2662c91b05d708ac9d9a53bb5671c059a5bec..e38e9fbf2eaba7a1f9098f43f1f2da419b875334 100644
--- a/chrome/renderer/content_settings_observer.cc
+++ b/chrome/renderer/content_settings_observer.cc
@@ -247,7 +247,7 @@ void ContentSettingsObserver::DidCommitProvisionalLoad(bool is_new_navigation) {
// If we start failing this DCHECK, please makes sure we don't regress
// this bug: http://code.google.com/p/chromium/issues/detail?id=79304
DCHECK(frame->document().securityOrigin().toString() == "null" ||
- !url.SchemeIs(content::kDataScheme));
+ !url.SchemeIs(url::kDataScheme));
}
bool ContentSettingsObserver::allowDatabase(const WebString& name,
@@ -697,8 +697,8 @@ bool ContentSettingsObserver::IsWhitelistedForContentSettings(
// If the scheme is file:, an empty file name indicates a directory listing,
// which requires JavaScript to function properly.
- if (EqualsASCII(origin.protocol(), content::kFileScheme)) {
- return document_url.SchemeIs(content::kFileScheme) &&
+ if (EqualsASCII(origin.protocol(), url::kFileScheme)) {
+ return document_url.SchemeIs(url::kFileScheme) &&
document_url.ExtractFileName().empty();
}
« no previous file with comments | « chrome/common/net/url_util.cc ('k') | chrome/renderer/extensions/chrome_extension_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698