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

chrome/browser/ui/views/frame/browser_view.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/views/frame/browser_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 62 matching lines @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/download/download_manager.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
-#include "content/browser/user_metrics.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/browser/user_metrics.h"
 #include "content/public/common/content_switches.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
 #include "grit/webkit_resources.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/accessibility/accessible_view_state.h"
@@ skipping 38 matching lines @@
 
 #if !defined(OS_CHROMEOS) || defined(USE_AURA)
 #include "chrome/browser/ui/views/download/download_shelf_view.h"
 #endif
 
 #if defined(USE_VIRTUAL_KEYBOARD)
 #include "chrome/browser/ui/touch/status_bubble_touch.h"
 #endif
 
 using base::TimeDelta;
+using content::UserMetricsAction;
 using views::ColumnSet;
 using views::GridLayout;
 
 namespace {
 // The height of the status bubble.
 const int kStatusBubbleHeight = 20;
 // The name of a key to store on the window handle so that other code can
 // locate this object using just the handle.
 const char* const kBrowserViewKey = "__BROWSER_VIEW__";
 // How frequently we check for hung plugin windows.
@@ skipping 2350 matching lines @@
     pref_service->SetInteger(prefs::kHungPluginDetectFrequency,
                              hung_plugin_detect_freq);
   }
 #endif
 }
 
 void BrowserView::UpdateAcceleratorMetrics(
     const ui::Accelerator& accelerator, int command_id) {
   const ui::KeyboardCode key_code = accelerator.key_code();
   if (command_id == IDC_HELP_PAGE && key_code == ui::VKEY_F1)
-    UserMetrics::RecordAction(UserMetricsAction("ShowHelpTabViaF1"));
+    content::RecordAction(UserMetricsAction("ShowHelpTabViaF1"));
 
 #if defined(OS_CHROMEOS)
   // Collect information about the relative popularity of various accelerators
   // on Chrome OS.
   switch (command_id) {
     case IDC_BACK:
       if (key_code == ui::VKEY_BACK)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_Back_Backspace"));
+        content::RecordAction(UserMetricsAction("Accel_Back_Backspace"));
       else if (key_code == ui::VKEY_F1)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_Back_F1"));
+        content::RecordAction(UserMetricsAction("Accel_Back_F1"));
       else if (key_code == ui::VKEY_LEFT)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_Back_Left"));
+        content::RecordAction(UserMetricsAction("Accel_Back_Left"));
       break;
     case IDC_FORWARD:
       if (key_code == ui::VKEY_BACK)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_Forward_Backspace"));
+        content::RecordAction(UserMetricsAction("Accel_Forward_Backspace"));
       else if (key_code == ui::VKEY_F2)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_Forward_F2"));
+        content::RecordAction(UserMetricsAction("Accel_Forward_F2"));
       else if (key_code == ui::VKEY_RIGHT)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_Forward_Right"));
+        content::RecordAction(UserMetricsAction("Accel_Forward_Right"));
       break;
     case IDC_RELOAD:
     case IDC_RELOAD_IGNORING_CACHE:
       if (key_code == ui::VKEY_R)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_Reload_R"));
+        content::RecordAction(UserMetricsAction("Accel_Reload_R"));
       else if (key_code == ui::VKEY_F3)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_Reload_F3"));
+        content::RecordAction(UserMetricsAction("Accel_Reload_F3"));
       break;
     case IDC_FULLSCREEN:
       if (key_code == ui::VKEY_F4)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_Fullscreen_F4"));
+        content::RecordAction(UserMetricsAction("Accel_Fullscreen_F4"));
       break;
     case IDC_NEW_TAB:
       if (key_code == ui::VKEY_T)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_NewTab_T"));
+        content::RecordAction(UserMetricsAction("Accel_NewTab_T"));
       break;
     case IDC_SEARCH:
       if (key_code == ui::VKEY_LWIN)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_Search_LWin"));
+        content::RecordAction(UserMetricsAction("Accel_Search_LWin"));
       break;
     case IDC_FOCUS_LOCATION:
       if (key_code == ui::VKEY_D)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_FocusLocation_D"));
+        content::RecordAction(UserMetricsAction("Accel_FocusLocation_D"));
       else if (key_code == ui::VKEY_L)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_FocusLocation_L"));
+        content::RecordAction(UserMetricsAction("Accel_FocusLocation_L"));
       break;
     case IDC_FOCUS_SEARCH:
       if (key_code == ui::VKEY_E)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_FocusSearch_E"));
+        content::RecordAction(UserMetricsAction("Accel_FocusSearch_E"));
       else if (key_code == ui::VKEY_K)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_FocusSearch_K"));
+        content::RecordAction(UserMetricsAction("Accel_FocusSearch_K"));
       break;
     default:
       // Do nothing.
       break;
   }
 #endif
 }
 
 void BrowserView::ProcessTabSelected(TabContentsWrapper* new_contents) {
   // If |contents_container_| already has the correct TabContents, we can save
@@ skipping 82 matching lines @@
   browser::CreateViewsBubble(bubble);
   bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
   bubble->Show();
 }
 
 void BrowserView::ShowAvatarBubbleFromAvatarButton() {
   AvatarMenuButton* button = frame_->GetAvatarMenuButton();
   if (button)
     button->ShowAvatarBubble();
 }