diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 21:53:05 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 21:53:05 +0000 |
| commit | ca40603dd4cf19d94d27a1d38268310cde4d44e2 (patch) | |
| tree | 308fd7869e5f0bca450da3accb71b48e62c2d0dc | |
| parent | 257c896e48e2998b9bdd030b7ce0feac76298868 (diff) | |
| download | chromium_src-ca40603dd4cf19d94d27a1d38268310cde4d44e2.zip chromium_src-ca40603dd4cf19d94d27a1d38268310cde4d44e2.tar.gz chromium_src-ca40603dd4cf19d94d27a1d38268310cde4d44e2.tar.bz2 | |
Collect stats on how many users see mixed scripting on google.com, so we can
be confident in blocking it without annoying a huge percentage of users.
Review URL: http://codereview.chromium.org/7453002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93102 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/tools/chromeactions.txt | 2 | ||||
| -rw-r--r-- | content/browser/tab_contents/tab_contents.cc | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/chrome/tools/chromeactions.txt b/chrome/tools/chromeactions.txt index bc397b8..dcfccff 100644 --- a/chrome/tools/chromeactions.txt +++ b/chrome/tools/chromeactions.txt @@ -9,6 +9,7 @@ 0xe9d2339d6b9225c7 AboutFlags_disable-outdated-plugins 0xdddbf34cee2c636c AboutFlags_dns-server 0x4eae5ccc2900dffa AboutFlags_enable-nacl +0x1a3d598e2cd416a0 AboutFlags_enable-smooth-scrolling 0x79571e31c2dc4d3c AboutFlags_experimental-location-features 0x307b8a127f85947e AboutFlags_expose-for-tabs 0x2c97f94b6aca4a22 AboutFlags_extension-apis @@ -1041,6 +1042,7 @@ 0xf8af4ff865669301 SBInterstitialPhishingShow 0xe1df5f4bee6d0e2f SSL.DisplayedInsecureContent 0xba6bde79f10497a9 SSL.RanInsecureContent +0x12affa291e3d0146 SSL.RanInsecureContentGoogle 0xc9cc8cce247e49ba Save 0xfc7723f7c10f79d5 SavePage 0xc849f604a9954989 ScreenLocker_OnLoginFailure diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index 8796abe..8838b3f 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -109,6 +109,8 @@ const int kQueryStateDelay = 5000; const int kSyncWaitDelay = 40; +static const char kDotGoogleDotCom[] = ".google.com"; + #if defined(OS_WIN) BOOL CALLBACK InvalidateWindow(HWND hwnd, LPARAM lparam) { @@ -985,6 +987,10 @@ void TabContents::OnDidRunInsecureContent( LOG(INFO) << security_origin << " ran insecure content from " << target_url.possibly_invalid_spec(); UserMetrics::RecordAction(UserMetricsAction("SSL.RanInsecureContent")); + if (EndsWith(security_origin, kDotGoogleDotCom, false)) { + UserMetrics::RecordAction( + UserMetricsAction("SSL.RanInsecureContentGoogle")); + } controller_.ssl_manager()->DidRunInsecureContent(security_origin); displayed_insecure_content_ = true; SSLManager::NotifySSLInternalStateChanged(); |