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

Unified Diff: chrome/renderer/content_settings_observer.cc

Issue 1176583003: Move EqualsASCII to the base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@string_util2
Patch Set: Created 5 years, 6 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/renderer/chrome_content_renderer_client.cc ('k') | chrome/renderer/net/net_error_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 332e29a7e99507e220d8fe1000637ae9826d3649..449d1b79907b196b2651f34f11224efbc41f1b18 100644
--- a/chrome/renderer/content_settings_observer.cc
+++ b/chrome/renderer/content_settings_observer.cc
@@ -663,7 +663,7 @@ bool ContentSettingsObserver::IsPlatformApp() {
#if defined(ENABLE_EXTENSIONS)
const extensions::Extension* ContentSettingsObserver::GetExtension(
const WebSecurityOrigin& origin) const {
- if (!EqualsASCII(origin.protocol(), extensions::kExtensionScheme))
+ if (!base::EqualsASCII(origin.protocol(), extensions::kExtensionScheme))
return NULL;
const std::string extension_id = origin.host().utf8().data();
@@ -697,14 +697,14 @@ bool ContentSettingsObserver::IsWhitelistedForContentSettings(
if (origin.isUnique())
return false; // Uninitialized document?
- if (EqualsASCII(origin.protocol(), content::kChromeUIScheme))
+ if (base::EqualsASCII(origin.protocol(), content::kChromeUIScheme))
return true; // Browser UI elements should still work.
- if (EqualsASCII(origin.protocol(), content::kChromeDevToolsScheme))
+ if (base::EqualsASCII(origin.protocol(), content::kChromeDevToolsScheme))
return true; // DevTools UI elements should still work.
#if defined(ENABLE_EXTENSIONS)
- if (EqualsASCII(origin.protocol(), extensions::kExtensionScheme))
+ if (base::EqualsASCII(origin.protocol(), extensions::kExtensionScheme))
return true;
#endif
@@ -715,7 +715,7 @@ 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(), url::kFileScheme)) {
+ if (base::EqualsASCII(origin.protocol(), url::kFileScheme)) {
return document_url.SchemeIs(url::kFileScheme) &&
document_url.ExtractFileName().empty();
}
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.cc ('k') | chrome/renderer/net/net_error_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698