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

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

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/content_settings_handler.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 11 matching lines @@
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_pattern.h"
 #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"
 #include "content/public/common/content_switches.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
@@ skipping 639 matching lines @@
   ContentSetting default_setting = ContentSettingFromString(setting);
   ContentSettingsType content_type = ContentSettingsTypeFromGroupName(group);
   if (content_type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS) {
     Profile* profile = Profile::FromWebUI(web_ui_);
     DesktopNotificationServiceFactory::GetForProfile(profile)->
         SetDefaultContentSetting(default_setting);
   } else {
     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) {
   size_t arg_i = 0;
   std::string type_string;
   CHECK(args->GetString(arg_i++, &type_string));
 
   Profile* profile = Profile::FromWebUI(web_ui_);
   ContentSettingsType type = ContentSettingsTypeFromGroupName(type_string);
   if (type == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
@@ skipping 126 matching lines @@
   return Profile::FromWebUI(web_ui_)->GetProtocolHandlerRegistry();
 }
 
 HostContentSettingsMap*
     ContentSettingsHandler::GetOTRContentSettingsMap() {
   Profile* profile = Profile::FromWebUI(web_ui_);
   if (profile->HasOffTheRecordProfile())
     return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap();
   return NULL;
 }