diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 23:10:40 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 23:10:40 +0000 |
| commit | 219f0dee693c3df3121f0b35a9b74344fe65ce3b (patch) | |
| tree | 2c3d6a8398e3accb7023f1712a29ff0cd95743e0 | |
| parent | b0a4c458211fe7fea0b875b077e0186c45125390 (diff) | |
| download | chromium_src-219f0dee693c3df3121f0b35a9b74344fe65ce3b.zip chromium_src-219f0dee693c3df3121f0b35a9b74344fe65ce3b.tar.gz chromium_src-219f0dee693c3df3121f0b35a9b74344fe65ce3b.tar.bz2 | |
Merge 93102 - 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
TBR=cevans@chromium.org
Review URL: http://codereview.chromium.org/7452011
git-svn-id: svn://svn.chromium.org/chrome/branches/782/src@93121 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/tab_contents/tab_contents.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index d70d91b..1eb4de7 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -112,6 +112,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) { @@ -952,6 +954,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); } |