summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorpetkov@chromium.org <petkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-16 18:30:01 +0000
committerpetkov@chromium.org <petkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-16 18:30:01 +0000
commit1078339c6d930e52d6aeca220ab36e990bdb3c35 (patch)
tree8f8d12e4cc6b6ff7a177a0ae067e1779271ec85d /chrome
parentfefac1589cca724b4ec32062467c7d533cfe75bf (diff)
downloadchromium_src-1078339c6d930e52d6aeca220ab36e990bdb3c35.zip
chromium_src-1078339c6d930e52d6aeca220ab36e990bdb3c35.tar.gz
chromium_src-1078339c6d930e52d6aeca220ab36e990bdb3c35.tar.bz2
Put UMA user actions added by Chrome OS CL#7565 in list of valid actions.
Included "Updater.ServerCertificateChanged" and "Updater.ServerCertificateFailed" to list of valid actions, and ran extract_actions.py in order to update hashes in chromeactions.txt. BUG=chromium-os:19842 TEST=None Review URL: http://codereview.chromium.org/7925011 Patch from Bruno Rocha <bpontes@chromium.org>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/chromeos/external_metrics.cc2
-rw-r--r--chrome/tools/chromeactions.txt5
-rwxr-xr-xchrome/tools/extract_actions.py4
3 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/external_metrics.cc b/chrome/browser/chromeos/external_metrics.cc
index dc69113..4980e52 100644
--- a/chrome/browser/chromeos/external_metrics.cc
+++ b/chrome/browser/chromeos/external_metrics.cc
@@ -46,6 +46,8 @@ void ExternalMetrics::Start() {
valid_user_actions_.insert("Accel_PrevWindow_F5");
valid_user_actions_.insert("Accel_BrightnessDown_F6");
valid_user_actions_.insert("Accel_BrightnessUp_F7");
+ valid_user_actions_.insert("Updater.ServerCertificateChanged");
+ valid_user_actions_.insert("Updater.ServerCertificateFailed");
ScheduleCollector();
}
diff --git a/chrome/tools/chromeactions.txt b/chrome/tools/chromeactions.txt
index d818267..6b49d8f 100644
--- a/chrome/tools/chromeactions.txt
+++ b/chrome/tools/chromeactions.txt
@@ -242,6 +242,9 @@
0x2e08637d43bc3450 EditSearchEngines
0x9a2fdef24427ff67 EmailPageLocation
0xfef46e5063ce3dc7 Exit
+0xdf56dffe242f621a Extensions.ExtensionInstalled
+0x4f07c158c8047ab9 Extensions.ExtensionUninstalled
+0xa295e3ad39bbacc0 Extensions.WebStoreLaunch
0x4cfa6c981549e990 Find
0x058404d575478e31 FindNext
0xca56592cf013fc40 FindPrevious
@@ -1178,6 +1181,8 @@
0x1cdc076b28f70afa Undo
0xc1a39b6a60f8b2f8 Unlink
0xbcd41ce97e3c5568 UpdateChrome
+0x0746723e6884a2fb Updater.ServerCertificateChanged
+0x169dd0fd613963e8 Updater.ServerCertificateFailed
0x9b4b5afb2e791f23 UpgradeCheck_AlreadyUpToDate
0x27b72192736f904d UpgradeCheck_AlreadyUpgraded
0x7a54d49f1f7db4ee UpgradeCheck_Done
diff --git a/chrome/tools/extract_actions.py b/chrome/tools/extract_actions.py
index 3249815..2ae25a4 100755
--- a/chrome/tools/extract_actions.py
+++ b/chrome/tools/extract_actions.py
@@ -215,6 +215,10 @@ def AddChromeOSActions(actions):
actions.add('Accel_BrightnessDown_F6')
actions.add('Accel_BrightnessUp_F7')
+ # Actions sent by Chrome OS update engine.
+ actions.add('Updater.ServerCertificateChanged')
+ actions.add('Updater.ServerCertificateFailed')
+
def GrepForActions(path, actions):
"""Grep a source file for calls to UserMetrics functions.