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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/chrome_render_view_observer.cc

Issue 8400043: Simplify and shrink the UMA reporting code for mixed content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_render_view_observer.cc
===================================================================
--- chrome/renderer/chrome_render_view_observer.cc (revision 107607)
+++ chrome/renderer/chrome_render_view_observer.cc (working copy)
@@ -442,84 +442,57 @@
return allowed;
}
+static void SendInsecureContentSignal(int signal) {
+ UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent", signal,
+ INSECURE_CONTENT_NUM_EVENTS);
+}
+
bool ChromeRenderViewObserver::allowDisplayingInsecureContent(
WebKit::WebFrame* frame,
bool allowed_per_settings,
const WebKit::WebSecurityOrigin& origin,
const WebKit::WebURL& url) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_DISPLAY,
- INSECURE_CONTENT_NUM_EVENTS);
+ SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY);
+
std::string host(origin.host().utf8());
GURL frame_url(frame->document().url());
if (isHostInDomain(host, kGoogleDotCom)) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_DISPLAY_HOST_GOOGLE,
- INSECURE_CONTENT_NUM_EVENTS);
+ SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_GOOGLE);
if (StartsWithASCII(frame_url.path(), kGoogleSupportPathPrefix, false)) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_DISPLAY_HOST_GOOGLE_SUPPORT,
- INSECURE_CONTENT_NUM_EVENTS);
+ SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_GOOGLE_SUPPORT);
} else if (StartsWithASCII(frame_url.path(),
kGoogleIntlPathPrefix,
false)) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_DISPLAY_HOST_GOOGLE_INTL,
- INSECURE_CONTENT_NUM_EVENTS);
+ SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_GOOGLE_INTL);
}
}
+
if (host == kWWWDotGoogleDotCom) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_DISPLAY_HOST_WWW_GOOGLE,
- INSECURE_CONTENT_NUM_EVENTS);
- if (StartsWithASCII(frame_url.path(), kGoogleReaderPathPrefix, false)) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_DISPLAY_HOST_GOOGLE_READER,
- INSECURE_CONTENT_NUM_EVENTS);
- }
- } else if (host == kMailDotGoogleDotCom) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_DISPLAY_HOST_MAIL_GOOGLE,
- INSECURE_CONTENT_NUM_EVENTS);
- } else if (host == kPlusDotGoogleDotCom) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_DISPLAY_HOST_PLUS_GOOGLE,
- INSECURE_CONTENT_NUM_EVENTS);
- } else if (host == kDocsDotGoogleDotCom) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_DISPLAY_HOST_DOCS_GOOGLE,
- INSECURE_CONTENT_NUM_EVENTS);
- } else if (host == kSitesDotGoogleDotCom) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_DISPLAY_HOST_SITES_GOOGLE,
- INSECURE_CONTENT_NUM_EVENTS);
- } else if (host == kPicasawebDotGoogleDotCom) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_DISPLAY_HOST_PICASAWEB_GOOGLE,
- INSECURE_CONTENT_NUM_EVENTS);
- } else if (host == kCodeDotGoogleDotCom) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_DISPLAY_HOST_CODE_GOOGLE,
- INSECURE_CONTENT_NUM_EVENTS);
- } else if (host == kGroupsDotGoogleDotCom) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_DISPLAY_HOST_GROUPS_GOOGLE,
- INSECURE_CONTENT_NUM_EVENTS);
- } else if (host == kMapsDotGoogleDotCom) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_DISPLAY_HOST_MAPS_GOOGLE,
- INSECURE_CONTENT_NUM_EVENTS);
- } else if (host == kWWWDotYoutubeDotCom) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_DISPLAY_HOST_YOUTUBE,
- INSECURE_CONTENT_NUM_EVENTS);
- }
+ SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_WWW_GOOGLE);
+ if (StartsWithASCII(frame_url.path(), kGoogleReaderPathPrefix, false))
+ SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_GOOGLE_READER);
+ } else if (host == kMailDotGoogleDotCom)
+ SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_MAIL_GOOGLE);
+ else if (host == kPlusDotGoogleDotCom)
jar (doing other things) 2011/10/27 23:41:31 nit: start all these even lines with a close curly
+ SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_PLUS_GOOGLE);
+ else if (host == kDocsDotGoogleDotCom)
+ SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_DOCS_GOOGLE);
+ else if (host == kSitesDotGoogleDotCom)
+ SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_SITES_GOOGLE);
+ else if (host == kPicasawebDotGoogleDotCom)
+ SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_PICASAWEB_GOOGLE);
+ else if (host == kCodeDotGoogleDotCom)
+ SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_CODE_GOOGLE);
+ else if (host == kGroupsDotGoogleDotCom)
+ SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_GROUPS_GOOGLE);
+ else if (host == kMapsDotGoogleDotCom)
+ SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_MAPS_GOOGLE);
+ else if (host == kWWWDotYoutubeDotCom)
+ SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HOST_YOUTUBE);
+
GURL gurl(url);
- if (EndsWith(gurl.path(), kDotHTML, false)) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_DISPLAY_HTML,
- INSECURE_CONTENT_NUM_EVENTS);
- }
+ if (EndsWith(gurl.path(), kDotHTML, false))
+ SendInsecureContentSignal(INSECURE_CONTENT_DISPLAY_HTML);
if (allowed_per_settings || allow_displaying_insecure_content_)
return true;
@@ -536,98 +509,56 @@
// Single value to control permissive mixed content behaviour.
const bool enforce_insecure_content_on_all_domains = true;
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_RUN,
- INSECURE_CONTENT_NUM_EVENTS);
std::string host(origin.host().utf8());
GURL frame_url(frame->document().url());
bool is_google = isHostInDomain(host, kGoogleDotCom);
if (is_google) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_RUN_HOST_GOOGLE,
- INSECURE_CONTENT_NUM_EVENTS);
+ SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_GOOGLE);
if (StartsWithASCII(frame_url.path(), kGoogleSupportPathPrefix, false)) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_RUN_HOST_GOOGLE_SUPPORT,
- INSECURE_CONTENT_NUM_EVENTS);
+ SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_GOOGLE_SUPPORT);
} else if (StartsWithASCII(frame_url.path(),
kGoogleIntlPathPrefix,
false)) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_RUN_HOST_GOOGLE_INTL,
- INSECURE_CONTENT_NUM_EVENTS);
+ SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_GOOGLE_INTL);
}
}
+
if (host == kWWWDotGoogleDotCom) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_RUN_HOST_WWW_GOOGLE,
- INSECURE_CONTENT_NUM_EVENTS);
- if (StartsWithASCII(frame_url.path(), kGoogleReaderPathPrefix, false)) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_RUN_HOST_GOOGLE_READER,
- INSECURE_CONTENT_NUM_EVENTS);
- }
- } else if (host == kMailDotGoogleDotCom) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_RUN_HOST_MAIL_GOOGLE,
- INSECURE_CONTENT_NUM_EVENTS);
- } else if (host == kPlusDotGoogleDotCom) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_RUN_HOST_PLUS_GOOGLE,
- INSECURE_CONTENT_NUM_EVENTS);
- } else if (host == kDocsDotGoogleDotCom) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_RUN_HOST_DOCS_GOOGLE,
- INSECURE_CONTENT_NUM_EVENTS);
- } else if (host == kSitesDotGoogleDotCom) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_RUN_HOST_SITES_GOOGLE,
- INSECURE_CONTENT_NUM_EVENTS);
- } else if (host == kPicasawebDotGoogleDotCom) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_RUN_HOST_PICASAWEB_GOOGLE,
- INSECURE_CONTENT_NUM_EVENTS);
- } else if (host == kCodeDotGoogleDotCom) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_RUN_HOST_CODE_GOOGLE,
- INSECURE_CONTENT_NUM_EVENTS);
- } else if (host == kGroupsDotGoogleDotCom) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_RUN_HOST_GROUPS_GOOGLE,
- INSECURE_CONTENT_NUM_EVENTS);
- } else if (host == kMapsDotGoogleDotCom) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_RUN_HOST_MAPS_GOOGLE,
- INSECURE_CONTENT_NUM_EVENTS);
- } else if (host == kWWWDotYoutubeDotCom) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_RUN_HOST_YOUTUBE,
- INSECURE_CONTENT_NUM_EVENTS);
- } else if (EndsWith(host, kDotGoogleUserContentDotCom, false)) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_RUN_HOST_GOOGLEUSERCONTENT,
- INSECURE_CONTENT_NUM_EVENTS);
- }
+ SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_WWW_GOOGLE);
+ if (StartsWithASCII(frame_url.path(), kGoogleReaderPathPrefix, false))
+ SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_GOOGLE_READER);
+ } else if (host == kMailDotGoogleDotCom)
jar (doing other things) 2011/10/27 23:41:31 nit: Once you start using curlies, you need to use
+ SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_MAIL_GOOGLE);
+ else if (host == kPlusDotGoogleDotCom)
+ SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_PLUS_GOOGLE);
+ else if (host == kDocsDotGoogleDotCom)
+ SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_DOCS_GOOGLE);
+ else if (host == kSitesDotGoogleDotCom)
+ SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_SITES_GOOGLE);
+ else if (host == kPicasawebDotGoogleDotCom)
+ SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_PICASAWEB_GOOGLE);
+ else if (host == kCodeDotGoogleDotCom)
+ SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_CODE_GOOGLE);
+ else if (host == kGroupsDotGoogleDotCom)
+ SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_GROUPS_GOOGLE);
+ else if (host == kMapsDotGoogleDotCom)
+ SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_MAPS_GOOGLE);
+ else if (host == kWWWDotYoutubeDotCom)
+ SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_YOUTUBE);
+ else if (EndsWith(host, kDotGoogleUserContentDotCom, false))
+ SendInsecureContentSignal(INSECURE_CONTENT_RUN_HOST_GOOGLEUSERCONTENT);
+
GURL gurl(url);
- if (gurl.host() == kWWWDotYoutubeDotCom) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_RUN_TARGET_YOUTUBE,
- INSECURE_CONTENT_NUM_EVENTS);
- }
- if (EndsWith(gurl.path(), kDotJS, false)) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_RUN_JS,
- INSECURE_CONTENT_NUM_EVENTS);
- } else if (EndsWith(gurl.path(), kDotCSS, false)) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_RUN_CSS,
- INSECURE_CONTENT_NUM_EVENTS);
- } else if (EndsWith(gurl.path(), kDotSWF, false)) {
- UMA_HISTOGRAM_ENUMERATION("SSL.InsecureContent",
- INSECURE_CONTENT_RUN_SWF,
- INSECURE_CONTENT_NUM_EVENTS);
- }
+ if (gurl.host() == kWWWDotYoutubeDotCom)
+ SendInsecureContentSignal(INSECURE_CONTENT_RUN_TARGET_YOUTUBE);
+ if (EndsWith(gurl.path(), kDotJS, false))
+ SendInsecureContentSignal(INSECURE_CONTENT_RUN_JS);
+ else if (EndsWith(gurl.path(), kDotCSS, false))
+ SendInsecureContentSignal(INSECURE_CONTENT_RUN_CSS);
+ else if (EndsWith(gurl.path(), kDotSWF, false))
+ SendInsecureContentSignal(INSECURE_CONTENT_RUN_SWF);
+
if (allow_running_insecure_content_ || allowed_per_settings)
return true;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698