Add UMA for default content settings values, and default content settings changed actions.

chrome/browser/ui/webui/options/content_settings_handler.cc

Index: chrome/browser/ui/webui/options/content_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index 4fe3e9b80bfef28ac4593f93b549ec5adef8f82a..9a834a33164edd1cfdf9d8caa38cfb151daf9023 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -29,6 +29,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/browser/user_metrics.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
@@ -688,6 +689,42 @@ void ContentSettingsHandler::SetContentFilter(const ListValue* args) {
     GetContentSettingsMap()->
         SetDefaultContentSetting(content_type, default_setting);
   }
+  switch (content_type) {
+    case CONTENT_SETTINGS_TYPE_COOKIES:
+      UserMetrics::RecordAction(
+          UserMetricsAction("DefaultCookieSettingChanged"));

[Patrick Dubroy, 2011/11/28 14:42:30]

Maybe name these something like "DefaultSettings_CookieSettingChanged"? Doesn't
sound as good but it would be better for grouping purposes.

[markusheintz_, 2011/11/28 15:18:41]

I chose the
ContentSetting_Default<ContentSettingsType>SettingChanged scheme.

This way we can group all content settings UMA together.

+      break;
+    case CONTENT_SETTINGS_TYPE_IMAGES:
+      UserMetrics::RecordAction(
+          UserMetricsAction("DefaultImagesSettingChanged"));
+      break;
+    case CONTENT_SETTINGS_TYPE_JAVASCRIPT:
+      UserMetrics::RecordAction(
+          UserMetricsAction("DefaultJavaScriptSettingChanged"));
+      break;
+    case CONTENT_SETTINGS_TYPE_PLUGINS:
+      UserMetrics::RecordAction(
+          UserMetricsAction("DefaultPluginsSettingChanged"));
+      break;
+    case CONTENT_SETTINGS_TYPE_POPUPS:
+      UserMetrics::RecordAction(
+          UserMetricsAction("DefaultPopupsSettingChanged"));
+      break;
+    case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
+      UserMetrics::RecordAction(
+          UserMetricsAction("DefaultNotificationsSettingChanged"));
+      break;
+    case CONTENT_SETTINGS_TYPE_GEOLOCATION:
+      UserMetrics::RecordAction(
+          UserMetricsAction("DefaultGeolocationSettingChanged"));
+      break;
+    case CONTENT_SETTINGS_TYPE_INTENTS:
+      UserMetrics::RecordAction(
+          UserMetricsAction("DefaultHandlersSettingChanged"));
+      break;

[battre, 2011/11/28 14:17:10]

I noticed that several content setting types don't occur here
(auto_select_certificate, fullscreen, mouselock). Is this intended?

[markusheintz_, 2011/11/28 15:18:41]

Auto_select_certificate and fullscreen have no default setting that can be set
by a user.

mouslock was a good catch. Thanks! 

+    default:
+      break;
+  }
 }
 
 void ContentSettingsHandler::RemoveException(const ListValue* args) {