Split UserMetrics into API vs. implementation. Move API to content/public.

chrome/browser/ui/toolbar/back_forward_menu_model.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 "build/build_config.h"
 
 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/event_disposition.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/browser/user_metrics.h"
+#include "content/public/browser/user_metrics.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "net/base/registry_controlled_domain.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/codec/png_codec.h"
 
+using content::UserMetricsAction;
+
 const int BackForwardMenuModel::kMaxHistoryItems = 12;
 const int BackForwardMenuModel::kMaxChapterStops = 5;
 static const int kMaxWidth = 700;
 
 BackForwardMenuModel::BackForwardMenuModel(Browser* browser,
                                            ModelType model_type)
     : browser_(browser),
       test_tab_contents_(NULL),
       model_type_(model_type),
       menu_model_delegate_(NULL) {
@@ skipping 119 matching lines @@
 
 void BackForwardMenuModel::ActivatedAt(int index) {
   ActivatedAt(index, 0);
 }
 
 void BackForwardMenuModel::ActivatedAt(int index, int event_flags) {
   DCHECK(!IsSeparator(index));
 
   // Execute the command for the last item: "Show Full History".
   if (index == GetItemCount() - 1) {
-    UserMetrics::RecordComputedAction(BuildActionName("ShowFullHistory", -1));
+    content::RecordComputedAction(BuildActionName("ShowFullHistory", -1));
     browser_->ShowSingletonTabOverwritingNTP(
         browser_->GetSingletonTabNavigateParams(
             GURL(chrome::kChromeUIHistoryURL)));
     return;
   }
 
   // Log whether it was a history or chapter click.
   if (index < GetHistoryItemCount()) {
-    UserMetrics::RecordComputedAction(
+    content::RecordComputedAction(
         BuildActionName("HistoryClick", index));
   } else {
-    UserMetrics::RecordComputedAction(
+    content::RecordComputedAction(
         BuildActionName("ChapterClick", index - GetHistoryItemCount() - 1));
   }
 
   int controller_index = MenuIndexToNavEntryIndex(index);
   WindowOpenDisposition disposition =
       browser::DispositionFromEventFlags(event_flags);
   if (!browser_->NavigateToIndexWithDisposition(controller_index, disposition))
     NOTREACHED();
 }
 
 void BackForwardMenuModel::MenuWillShow() {
-  UserMetrics::RecordComputedAction(BuildActionName("Popup", -1));
+  content::RecordComputedAction(BuildActionName("Popup", -1));
   requested_favicons_.clear();
   load_consumer_.CancelAllRequests();
 }
 
 bool BackForwardMenuModel::IsSeparator(int index) const {
   int history_items = GetHistoryItemCount();
   // If the index is past the number of history items + separator,
   // we then consider if it is a chapter-stop entry.
   if (index > history_items) {
     // We either are in ChapterStop area, or at the end of the list (the "Show
@@ skipping 250 matching lines @@
     metric_string += "ForwardMenu_";
   else
     metric_string += "BackMenu_";
   metric_string += action;
   if (index != -1) {
     // +1 is for historical reasons (indices used to start at 1).
     metric_string += base::IntToString(index + 1);
   }
   return metric_string;
 }