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

chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.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/gtk/bookmarks/bookmark_bubble_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/bookmarks/recently_used_folders_combo_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/chrome_notification_types.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 "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::UserMetricsAction;
+
 namespace {
 
 // We basically have a singleton, since a bubble is sort of app-modal.  This
 // keeps track of the currently open bubble, or NULL if none is open.
 BookmarkBubbleGtk* g_bubble = NULL;
 
 // Padding between content and edge of bubble.
 const int kContentBorder = 7;
 
 }  // namespace
@@ skipping 175 matching lines @@
   delete this;
 }
 
 void BookmarkBubbleGtk::OnNameActivate(GtkWidget* widget) {
   bubble_->Close();
 }
 
 void BookmarkBubbleGtk::OnFolderChanged(GtkWidget* widget) {
   int index = gtk_combo_box_get_active(GTK_COMBO_BOX(folder_combo_));
   if (index == folder_combo_model_->GetItemCount() - 1) {
-    UserMetrics::RecordAction(
+    content::RecordAction(
         UserMetricsAction("BookmarkBubble_EditFromCombobox"));
     // GTK doesn't handle having the combo box destroyed from the changed
     // signal.  Since showing the editor also closes the bubble, delay this
     // so that GTK can unwind.  Specifically gtk_menu_shell_button_release
     // will run, and we need to keep the combo box alive until then.
     MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&BookmarkBubbleGtk::ShowEditor, factory_.GetWeakPtr()));
   }
 }
 
 void BookmarkBubbleGtk::OnFolderPopupShown(GtkWidget* widget,
                                            GParamSpec* property) {
   // GtkComboBox grabs the keyboard and pointer when it displays its popup,
   // which steals the grabs that BubbleGtk had installed.  When the popup is
   // hidden, we notify BubbleGtk so it can try to reacquire the grabs
   // (otherwise, GTK won't activate our widgets when the user clicks in them).
   gboolean popup_shown = FALSE;
   g_object_get(G_OBJECT(folder_combo_), "popup-shown", &popup_shown, NULL);
   if (!popup_shown)
     bubble_->HandlePointerAndKeyboardUngrabbedByContent();
 }
 
 void BookmarkBubbleGtk::OnEditClicked(GtkWidget* widget) {
-  UserMetrics::RecordAction(UserMetricsAction("BookmarkBubble_Edit"));
+  content::RecordAction(UserMetricsAction("BookmarkBubble_Edit"));
   ShowEditor();
 }
 
 void BookmarkBubbleGtk::OnCloseClicked(GtkWidget* widget) {
   bubble_->Close();
 }
 
 void BookmarkBubbleGtk::OnRemoveClicked(GtkWidget* widget) {
-  UserMetrics::RecordAction(UserMetricsAction("BookmarkBubble_Unstar"));
+  content::RecordAction(UserMetricsAction("BookmarkBubble_Unstar"));
 
   apply_edits_ = false;
   remove_bookmark_ = true;
   bubble_->Close();
 }
 
 void BookmarkBubbleGtk::ApplyEdits() {
   // Set this to make sure we don't attempt to apply edits again.
   apply_edits_ = false;
 
   const BookmarkNode* node = model_->GetMostRecentlyAddedNodeForURL(url_);
   if (node) {
     const string16 new_title(
         UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(name_entry_))));
 
     if (new_title != node->GetTitle()) {
       model_->SetTitle(node, new_title);
-      UserMetrics::RecordAction(
+      content::RecordAction(
           UserMetricsAction("BookmarkBubble_ChangeTitleInBubble"));
     }
 
     int index = gtk_combo_box_get_active(GTK_COMBO_BOX(folder_combo_));
 
     // Last index means 'Choose another folder...'
     if (index < folder_combo_model_->GetItemCount() - 1) {
       const BookmarkNode* new_parent = folder_combo_model_->GetNodeAt(index);
       if (new_parent != node->parent()) {
-        UserMetrics::RecordAction(
+        content::RecordAction(
             UserMetricsAction("BookmarkBubble_ChangeParent"));
         model_->Move(node, new_parent, new_parent->child_count());
       }
     }
   }
 }
 
 std::string BookmarkBubbleGtk::GetTitle() {
   const BookmarkNode* node = model_->GetMostRecentlyAddedNodeForURL(url_);
   if (!node) {
@@ skipping 33 matching lines @@
   // We always have nodes + 1 entries in the combo.  The last entry will be
   // the 'Select another folder...' entry that opens the bookmark editor.
   for (int i = 0; i < folder_combo_model_->GetItemCount(); ++i) {
     gtk_combo_box_append_text(GTK_COMBO_BOX(folder_combo_),
         UTF16ToUTF8(folder_combo_model_->GetItemAt(i)).c_str());
   }
 
   gtk_combo_box_set_active(GTK_COMBO_BOX(folder_combo_),
                            folder_combo_model_->node_parent_index());
 }