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

Unified Diff: chrome/renderer/content_settings_observer.cc

Issue 1172183002: Move StartsWith[ASCII] to base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@string_util3
Patch Set: merger 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/extensions/app_bindings.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 449d1b79907b196b2651f34f11224efbc41f1b18..af4158b9a5d11aef91336615c6a2f0b809291629 100644
--- a/chrome/renderer/content_settings_observer.cc
+++ b/chrome/renderer/content_settings_observer.cc
@@ -474,18 +474,19 @@ bool ContentSettingsObserver::allowDisplayingInsecureContent(
GURL frame_gurl(frame->document().url());
if (IsHostInDomain(origin_host, kGoogleDotCom)) {
SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_GOOGLE);
- if (StartsWithASCII(frame_gurl.path(), kGoogleSupportPathPrefix, false)) {
+ if (base::StartsWithASCII(frame_gurl.path(), kGoogleSupportPathPrefix,
+ false)) {
SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_GOOGLE_SUPPORT);
- } else if (StartsWithASCII(frame_gurl.path(),
- kGoogleIntlPathPrefix,
- false)) {
+ } else if (base::StartsWithASCII(frame_gurl.path(), kGoogleIntlPathPrefix,
+ false)) {
SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_GOOGLE_INTL);
}
}
if (origin_host == kWWWDotGoogleDotCom) {
SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_WWW_GOOGLE);
- if (StartsWithASCII(frame_gurl.path(), kGoogleReaderPathPrefix, false))
+ if (base::StartsWithASCII(frame_gurl.path(), kGoogleReaderPathPrefix,
+ false))
SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_GOOGLE_READER);
} else if (origin_host == kMailDotGoogleDotCom) {
SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_MAIL_GOOGLE);
@@ -531,18 +532,19 @@ bool ContentSettingsObserver::allowRunningInsecureContent(
bool is_google = IsHostInDomain(origin_host, kGoogleDotCom);
if (is_google) {
SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_GOOGLE);
- if (StartsWithASCII(frame_gurl.path(), kGoogleSupportPathPrefix, false)) {
+ if (base::StartsWithASCII(frame_gurl.path(), kGoogleSupportPathPrefix,
+ false)) {
SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_GOOGLE_SUPPORT);
- } else if (StartsWithASCII(frame_gurl.path(),
- kGoogleIntlPathPrefix,
- false)) {
+ } else if (base::StartsWithASCII(frame_gurl.path(), kGoogleIntlPathPrefix,
+ false)) {
SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_GOOGLE_INTL);
}
}
if (origin_host == kWWWDotGoogleDotCom) {
SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_WWW_GOOGLE);
- if (StartsWithASCII(frame_gurl.path(), kGoogleReaderPathPrefix, false))
+ if (base::StartsWithASCII(frame_gurl.path(), kGoogleReaderPathPrefix,
+ false))
SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_GOOGLE_READER);
} else if (origin_host == kMailDotGoogleDotCom) {
SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_MAIL_GOOGLE);
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.cc ('k') | chrome/renderer/extensions/app_bindings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698