summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 14:25:14 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 14:25:14 +0000
commite3ff0f76a65fdae99aa892b8471061d70dcd2809 (patch)
tree2eb3a904ddb5187e3216a8412d68308e71e3b1cb
parent8d250bb6dd4b50793f5ff622df05466f26999162 (diff)
downloadchromium_src-e3ff0f76a65fdae99aa892b8471061d70dcd2809.zip
chromium_src-e3ff0f76a65fdae99aa892b8471061d70dcd2809.tar.gz
chromium_src-e3ff0f76a65fdae99aa892b8471061d70dcd2809.tar.bz2
Add UMA for cookie settings
BUG=none TEST=none Review URL: http://codereview.chromium.org/6853013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81583 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/content_settings/content_settings_pref_provider.cc9
-rw-r--r--chrome/browser/profiles/profile_impl.cc8
-rw-r--r--chrome/tools/chromeactions.txt4
3 files changed, 21 insertions, 0 deletions
diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc
index e73ed18..841b281 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider.cc
@@ -11,6 +11,7 @@
#include "base/command_line.h"
#include "chrome/browser/content_settings/content_settings_details.h"
#include "chrome/browser/content_settings/content_settings_pattern.h"
+#include "chrome/browser/metrics/user_metrics.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prefs/scoped_user_pref_update.h"
#include "chrome/browser/profiles/profile.h"
@@ -99,6 +100,14 @@ PrefDefaultProvider::PrefDefaultProvider(Profile* profile)
DCHECK_EQ(arraysize(kTypeNames),
static_cast<size_t>(CONTENT_SETTINGS_NUM_TYPES));
ReadDefaultSettings(true);
+ if (default_content_settings_.settings[CONTENT_SETTINGS_TYPE_COOKIES] ==
+ CONTENT_SETTING_BLOCK) {
+ UserMetrics::RecordAction(
+ UserMetricsAction("CookieBlockingEnabledPerDefault"));
+ } else {
+ UserMetrics::RecordAction(
+ UserMetricsAction("CookieBlockingDisabledPerDefault"));
+ }
pref_change_registrar_.Init(prefs);
pref_change_registrar_.Add(prefs::kDefaultContentSettings, this);
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 4a71f99..36c656c 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -41,6 +41,7 @@
#include "chrome/browser/history/history.h"
#include "chrome/browser/history/top_sites.h"
#include "chrome/browser/instant/instant_controller.h"
+#include "chrome/browser/metrics/user_metrics.h"
#include "chrome/browser/net/chrome_url_request_context.h"
#include "chrome/browser/net/gaia/token_service.h"
#include "chrome/browser/net/net_pref_observer.h"
@@ -309,6 +310,13 @@ ProfileImpl::ProfileImpl(const FilePath& path)
InitRegisteredProtocolHandlers();
clear_local_state_on_exit_ = prefs->GetBoolean(prefs::kClearSiteDataOnExit);
+ if (clear_local_state_on_exit_) {
+ UserMetrics::RecordAction(
+ UserMetricsAction("ClearSiteDataOnExitEnabled"));
+ } else {
+ UserMetrics::RecordAction(
+ UserMetricsAction("ClearSiteDataOnExitDisabled"));
+ }
// Log the profile size after a reasonable startup delay.
BrowserThread::PostDelayedTask(BrowserThread::FILE, FROM_HERE,
diff --git a/chrome/tools/chromeactions.txt b/chrome/tools/chromeactions.txt
index d9345f4..a4ad550 100644
--- a/chrome/tools/chromeactions.txt
+++ b/chrome/tools/chromeactions.txt
@@ -174,6 +174,8 @@
0x511e8366cdda3890 ClearBrowsingData_Passwords
0x6d69a061f7adf595 ClearBrowsingData_ShowDlg
0x9fd631c62234969a ClearSelection
+0x49c37636ddeb5a10 ClearSiteDataOnExitDisabled
+0xf63362e0c7d7420d ClearSiteDataOnExitEnabled
0xf2c974774a0fd57e ClickToPlay_AllowAlways
0x3589e51b0b1bf730 ClickToPlay_Dismiss_Infobar
0xe1b2d67ea37c5ba0 ClickToPlay_InfobarShown
@@ -187,6 +189,8 @@
0x4b31de70a21d7903 CloseWebApp
0xdf8926d323575ff8 CloseWindow
0xa0ebbbdb0eca8d89 ConflictBadge
+0x33056b44f816c204 CookieBlockingDisabledPerDefault
+0xcc192d44d8f426c7 CookieBlockingEnabledPerDefault
0x5fb63579fc981698 Copy
0xb3d0f42456c6eaf6 CopyURLToClipBoard
0x2aeb39c03cc86464 CreateLink