Revert 58663 - Revert 58641 - Add user metrics for nonsandboxed plugin infobar.

BUG=52341
TEST=none

Review URL: http://codereview.chromium.org/3303003

TBR=bauerb@chromium.org
Review URL: http://codereview.chromium.org/3300015

TBR=mal@chromium.org
Review URL: http://codereview.chromium.org/3303011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58666 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 0 deletions

diff --git a/chrome/browser/blocked_plugin_manager.cc b/chrome/browser/blocked_plugin_manager.cc
index d8c67bb..2da3653 100644
--- a/chrome/browser/blocked_plugin_manager.cc
+++ b/chrome/browser/blocked_plugin_manager.cc
@@ -9,6 +9,7 @@
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/host_content_settings_map.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
@@ -25,6 +26,7 @@ void BlockedPluginManager::OnNonSandboxedPluginBlocked(
     const string16& name) {
   plugin_ = plugin;
   name_ = name;
+  UserMetrics::RecordAction(UserMetricsAction("ClickToPlay_InfobarShown"));
   tab_contents_->AddInfoBar(this);
 }
 
@@ -62,6 +64,7 @@ SkBitmap* BlockedPluginManager::GetIcon() const {
 }
 
 bool BlockedPluginManager::Accept() {
+  UserMetrics::RecordAction(UserMetricsAction("ClickToPlay_LoadAll_Infobar"));
   tab_contents_->render_view_host()->LoadBlockedPlugins();
   return true;
 }
@@ -69,6 +72,7 @@ bool BlockedPluginManager::Accept() {
 bool BlockedPluginManager::Cancel() {
   DCHECK(CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableResourceContentSettings));
+  UserMetrics::RecordAction(UserMetricsAction("ClickToPlay_AllowAlways"));
   tab_contents_->profile()->GetHostContentSettingsMap()->AddExceptionForURL(
       tab_contents_->GetURL(), CONTENT_SETTINGS_TYPE_PLUGINS, plugin_,
       CONTENT_SETTING_ALLOW);
@@ -76,6 +80,10 @@ bool BlockedPluginManager::Cancel() {
   return true;
 }
 
+void BlockedPluginManager::InfoBarDismissed() {
+  UserMetrics::RecordAction(UserMetricsAction("ClickToPlay_Dismiss_Infobar"));
+}
+
 bool BlockedPluginManager::LinkClicked(WindowOpenDisposition disposition) {
   // TODO(bauerb): Navigate to a help page explaining why we blocked the plugin,
   // once we have one.