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

chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h"
 
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_cell_single_line.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
-#include "content/browser/user_metrics.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/browser/user_metrics.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
+using content::UserMetricsAction;
+
 
 // Simple class to watch for tab creation/destruction and close the bubble.
 // Bridge between Chrome-style notifications and ObjC-style notifications.
 class BookmarkBubbleNotificationBridge : public content::NotificationObserver {
  public:
   BookmarkBubbleNotificationBridge(BookmarkBubbleController* controller,
                                    SEL selector);
   virtual ~BookmarkBubbleNotificationBridge() {}
   void Observe(int type,
                const content::NotificationSource& source,
@@ skipping 225 matching lines @@
 }
 
 // Shows the bookmark editor sheet for more advanced editing.
 - (void)showEditor {
   [self ok:self];
   // Send the action up through the responder chain.
   [NSApp sendAction:@selector(editBookmarkNode:) to:nil from:self];
 }
 
 - (IBAction)edit:(id)sender {
-  UserMetrics::RecordAction(UserMetricsAction("BookmarkBubble_Edit"));
+  content::RecordAction(UserMetricsAction("BookmarkBubble_Edit"));
   [self showEditor];
 }
 
 - (IBAction)ok:(id)sender {
   [self stopPulsingBookmarkButton];  // before parent changes
   [self updateBookmarkNode];
   [self close];
 }
 
 // By implementing this, ESC causes the window to go away. If clicking the
 // star was what prompted this bubble to appear (i.e., not already bookmarked),
 // remove the bookmark.
 - (IBAction)cancel:(id)sender {
   if (!alreadyBookmarked_) {
     // |-remove:| calls |-close| so don't do it.
     [self remove:sender];
   } else {
     [self ok:sender];
   }
 }
 
 - (IBAction)remove:(id)sender {
   [self stopPulsingBookmarkButton];
   bookmark_utils::RemoveAllBookmarks(model_, node_->url());
-  UserMetrics::RecordAction(UserMetricsAction("BookmarkBubble_Unstar"));
+  content::RecordAction(UserMetricsAction("BookmarkBubble_Unstar"));
   node_ = NULL;  // no longer valid
   [self ok:sender];
 }
 
 // The controller is  the target of the pop up button box action so it can
 // handle when "choose another folder" was picked.
 - (IBAction)folderChanged:(id)sender {
   DCHECK([sender isEqual:folderPopUpButton_]);
   // It is possible that due to model change our parent window has been closed
   // but the popup is still showing and able to notify the controller of a
   // folder change.  We ignore the sender in this case.
   if (!parentWindow_)
     return;
   NSMenuItem* selected = [folderPopUpButton_ selectedItem];
   ChooseAnotherFolder* chooseItem = [[self class] chooseAnotherFolderObject];
   if ([[selected representedObject] isEqual:chooseItem]) {
-    UserMetrics::RecordAction(
+    content::RecordAction(
         UserMetricsAction("BookmarkBubble_EditFromCombobox"));
     [self showEditor];
   }
 }
 
 // The controller is the delegate of the window so it receives did resign key
 // notifications. When key is resigned mirror Windows behavior and close the
 // window.
 - (void)windowDidResignKey:(NSNotification*)notification {
   NSWindow* window = [self window];
   DCHECK_EQ([notification object], window);
   if ([window isVisible]) {
     // If the window isn't visible, it is already closed, and this notification
     // has been sent as part of the closing operation, so no need to close.
     [self ok:self];
   }
 }
 
 // Look at the dialog; if the user has changed anything, update the
 // bookmark node to reflect this.
 - (void)updateBookmarkNode {
   if (!node_) return;
 
   // First the title...
   NSString* oldTitle = base::SysUTF16ToNSString(node_->GetTitle());
   NSString* newTitle = [nameTextField_ stringValue];
   if (![oldTitle isEqual:newTitle]) {
     model_->SetTitle(node_, base::SysNSStringToUTF16(newTitle));
-    UserMetrics::RecordAction(
+    content::RecordAction(
         UserMetricsAction("BookmarkBubble_ChangeTitleInBubble"));
   }
   // Then the parent folder.
   const BookmarkNode* oldParent = node_->parent();
   NSMenuItem* selectedItem = [folderPopUpButton_ selectedItem];
   id representedObject = [selectedItem representedObject];
   if ([representedObject isEqual:[[self class] chooseAnotherFolderObject]]) {
     // "Choose another folder..."
     return;
   }
   const BookmarkNode* newParent =
       static_cast<const BookmarkNode*>([representedObject pointerValue]);
   DCHECK(newParent);
   if (oldParent != newParent) {
     int index = newParent->child_count();
     model_->Move(node_, newParent, index);
-    UserMetrics::RecordAction(UserMetricsAction("BookmarkBubble_ChangeParent"));
+    content::RecordAction(UserMetricsAction("BookmarkBubble_ChangeParent"));
   }
 }
 
 // Fill in all information related to the folder pop up button.
 - (void)fillInFolderList {
   [nameTextField_ setStringValue:base::SysUTF16ToNSString(node_->GetTitle())];
   DCHECK([folderPopUpButton_ numberOfItems] == 0);
   [self addFolderNodes:model_->root_node()
          toPopUpButton:folderPopUpButton_
            indentation:0];
@@ skipping 59 matching lines @@
   NSInteger idx = [menu indexOfItemWithRepresentedObject:parentValue];
   DCHECK(idx != -1);
   [folderPopUpButton_ selectItemAtIndex:idx];
 }
 
 - (NSPopUpButton*)folderPopUpButton {
   return folderPopUpButton_;
 }
 
 @end  // implementation BookmarkBubbleController(ExposedForUnitTesting)