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

chrome/browser/chromeos/status/input_method_menu.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/chromeos/status/input_method_menu.h"
 
 #include <string>
 #include <vector>
 
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
-#include "content/browser/user_metrics.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/browser/user_metrics.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/widget/widget.h"
 
+using content::UserMetricsAction;
+
 // The language menu consists of 3 parts (in this order):
 //
 //   (1) input method names. The size of the list is always >= 1.
 //   (2) input method properties. This list might be empty.
 //   (3) "Customize language and input..." button.
 //
 // Example of the menu (Japanese):
 //
 // ============================== (border of the popup window)
 // [ ] English                    (|index| in the following functions is 0)
@@ skipping 304 matching lines @@
     OpenConfigUI();
     return;
   }
 
   if (IndexIsInInputMethodList(index)) {
     // Inter-IME switching.
     const input_method::InputMethodDescriptor& input_method
         = input_method_descriptors_->at(index);
     InputMethodManager::GetInstance()->ChangeInputMethod(
         input_method.id());
-    UserMetrics::RecordAction(
+    content::RecordAction(
         UserMetricsAction("LanguageMenuButton_InputMethodChanged"));
     return;
   }
 
   if (GetPropertyIndex(index, &index)) {
     // Intra-IME switching (e.g. Japanese-Hiragana to Japanese-Katakana).
     const input_method::ImePropertyList& property_list
         = InputMethodManager::GetInstance()->current_ime_properties();
     const std::string key = property_list.at(index).key;
     if (property_list.at(index).is_selection_item) {
@@ skipping 113 matching lines @@
     }
     const std::string current_input_method_id =
         current_input_method_pref_.GetValue();
     if (!current_input_method_id.empty()) {
       manager->ChangeInputMethod(current_input_method_id);
     }
   }
 }
 
 void InputMethodMenu::PrepareForMenuOpen() {
-  UserMetrics::RecordAction(UserMetricsAction("LanguageMenuButton_Open"));
+  content::RecordAction(UserMetricsAction("LanguageMenuButton_Open"));
   PrepareMenuModel();
 }
 
 void InputMethodMenu::PrepareMenuModel() {
   input_method_descriptors_.reset(InputMethodManager::GetInstance()->
                                   GetActiveInputMethods());
   RebuildModel();
 }
 
 void InputMethodMenu::ActiveInputMethodsChanged(
@@ skipping 241 matching lines @@
 }
 
 void InputMethodMenu::InitializePrefMembers() {
   previous_input_method_pref_.Init(
       prefs::kLanguagePreviousInputMethod, pref_service_, this);
   current_input_method_pref_.Init(
       prefs::kLanguageCurrentInputMethod, pref_service_, this);
 }
 
 }  // namespace chromeos