Introduce BookmarkClient interface to abstract embedder

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

 // Copyright (c) 2012 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_bar_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 664 matching lines @@
   DCHECK([sender respondsToSelector:@selector(bookmarkNode)]);
   const BookmarkNode* node = [sender bookmarkNode];
   DCHECK(node);
   WindowOpenDisposition disposition =
       ui::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
   RecordAppLaunch(browser_->profile(), node->url());
   [self openURL:node->url() disposition:disposition];
 
   if (!animate)
     [self closeFolderAndStopTrackingMenus];
-  RecordBookmarkLaunch(node, [self bookmarkLaunchLocation]);
+  RecordBookmarkLaunch(bookmarkModel_, node, [self bookmarkLaunchLocation]);
 }
 
 // Common function to open a bookmark folder of any type.
 - (void)openBookmarkFolder:(id)sender {
   DCHECK([sender isKindOfClass:[BookmarkButton class]]);
   DCHECK([[sender cell] isKindOfClass:[BookmarkButtonCell class]]);
 
   // Only record the action if it's the initial folder being opened.
   if (!showFolderMenus_)
-    RecordBookmarkFolderOpen([self bookmarkLaunchLocation]);
+    RecordBookmarkFolderOpen(bookmarkModel_, [self bookmarkLaunchLocation]);
   showFolderMenus_ = !showFolderMenus_;
 
   if (sender == offTheSideButton_)
     [[sender cell] setStartingChildIndex:displayedButtonCount_];
 
   // Toggle presentation of bar folder menus.
   [folderTarget_ openBookmarkFolderFromButton:sender];
 }
 
 // Click on a bookmark folder button.
@@ skipping 516 matching lines @@
   [appsPageShortcutButton_ setToolTip:tooltip];
   [buttonView_ addSubview:appsPageShortcutButton_.get()];
 
   [self setAppsPageShortcutButtonVisibility];
 }
 
 - (void)openAppsPage:(id)sender {
   WindowOpenDisposition disposition =
       ui::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
   [self openURL:GURL(chrome::kChromeUIAppsURL) disposition:disposition];
-  RecordBookmarkAppsPageOpen([self bookmarkLaunchLocation]);
+  RecordBookmarkAppsPageOpen(bookmarkModel_, [self bookmarkLaunchLocation]);
 }
 
 // To avoid problems with sync, changes that may impact the current
 // bookmark (e.g. deletion) make sure context menus are closed.  This
 // prevents deleting a node which no longer exists.
 - (void)cancelMenuTracking {
   [contextMenuController_ cancelTracking];
 }
 
 - (void)moveToState:(BookmarkBar::State)nextState
@@ skipping 1437 matching lines @@
 - (id<BookmarkButtonControllerProtocol>)controllerForNode:
     (const BookmarkNode*)node {
   // See if it's in the bar, then if it is in the hierarchy of visible
   // folder menus.
   if (bookmarkModel_->bookmark_bar_node() == node)
     return self;
   return [folderController_ controllerForNode:node];
 }
 
 @end