chromeos: Simplify user action code.

chrome/browser/chromeos/external_metrics.cc

 // Copyright (c) 2010 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/chromeos/external_metrics.h"
 
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
 #include "base/basictypes.h"
 #include "base/eintr_wrapper.h"
 #include "base/metrics/histogram.h"
 #include "base/perftimer.h"
 #include "base/time.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/metrics/user_metrics.h"
 
-// Steps to add an action.
-//
-// 1. Enter a helper function that calls UserMetrics::RecordAction.
-//
-// 2. Add a line for that function in InitializeUserActions.
-//
-// 3. Enjoy the recompilation.
-//
-// TODO(semenzato): should see if it is possible to avoid recompiling code
-// every time a new user action is added, and register it in some other way.
-
 namespace chromeos {
 
 // The interval between external metrics collections, in milliseconds.
 static const int kExternalMetricsCollectionIntervalMs = 30 * 1000;
 
-// There is one of the following functions for every user action as we have to
-// call RecordAction in a way that gets picked up by the processing scripts.
-static void RecordTabOverviewKeystroke() {
-  UserMetrics::RecordAction(UserMetricsAction("TabOverview_Keystroke"));
-}
-
-static void RecordTabOverviewExitMouse() {
-  UserMetrics::RecordAction(UserMetricsAction("TabOverview_ExitMouse"));
-}
-
 void ExternalMetrics::Start() {
-  InitializeUserActions();
   ScheduleCollector();
 }
 
-void ExternalMetrics::DefineUserAction(const std::string& name,
-                                       RecordFunctionType f) {
-  DCHECK(action_recorders_.find(name) == action_recorders_.end());
-  action_recorders_[name] = f;
-}
-
-void ExternalMetrics::InitializeUserActions() {
-  DefineUserAction("TabOverviewExitMouse", RecordTabOverviewExitMouse);

[Daniel Erat, 2011/01/20 00:44:23]

I don't think that these exist anymore, so I'm not bothering to add them to the
script.

[petkov, 2011/01/20 01:00:53]

I'm not sure these ever existed...

-  DefineUserAction("TabOverviewKeystroke", RecordTabOverviewKeystroke);
-}
-
 void ExternalMetrics::RecordActionUI(std::string action_string) {
-  base::hash_map<std::string, RecordFunctionType>::const_iterator iterator;
-  iterator = action_recorders_.find(action_string);
-  if (iterator == action_recorders_.end()) {
-    LOG(ERROR) << "undefined UMA action: " << action_string;
-  } else {
-    iterator->second();
-  }
+  UserMetrics::RecordComputedAction(action_string);
 }
 
 void ExternalMetrics::RecordAction(const char* action) {
   std::string action_string(action);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      NewRunnableMethod(this, &ExternalMetrics::RecordActionUI, action));
+      NewRunnableMethod(this, &ExternalMetrics::RecordActionUI, action_string));
 }
 
 void ExternalMetrics::RecordHistogram(const char* histogram_data) {
   int sample, min, max, nbuckets;
   char name[128];   // length must be consistent with sscanf format below.
   int n = sscanf(histogram_data, "%127s %d %d %d %d",
                  name, &sample, &min, &max, &nbuckets);
   if (n != 5) {
     LOG(ERROR) << "bad histogram request: " << histogram_data;
     return;
@@ skipping 139 matching lines @@
 void ExternalMetrics::ScheduleCollector() {
   bool result;
   result = BrowserThread::PostDelayedTask(
     BrowserThread::FILE, FROM_HERE, NewRunnableMethod(
         this, &chromeos::ExternalMetrics::CollectEventsAndReschedule),
     kExternalMetricsCollectionIntervalMs);
   DCHECK(result);
 }
 
 }  // namespace chromeos