Introduce ChromeBookmarkClientFactory

chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_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_bubble_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
@@ skipping 36 matching lines @@
   // folder" item in the pop up.
   static ChooseAnotherFolder* object = nil;
   if (!object) {
     object = [[ChooseAnotherFolder alloc] init];
   }
   return object;
 }
 
 - (id)initWithParentWindow:(NSWindow*)parentWindow
                     client:(ChromeBookmarkClient*)client
+                     model:(BookmarkModel*)model
                       node:(const BookmarkNode*)node
          alreadyBookmarked:(BOOL)alreadyBookmarked {
   DCHECK(client);
   DCHECK(node);
   if ((self = [super initWithWindowNibPath:@"BookmarkBubble"
                               parentWindow:parentWindow
                                 anchoredAt:NSZeroPoint])) {
     client_ = client;
+    model_ = model;
     node_ = node;
     alreadyBookmarked_ = alreadyBookmarked;
   }
   return self;
 }
 
 - (void)awakeFromNib {
   [super awakeFromNib];
 
   [[nameTextField_ cell] setUsesSingleLineMode:YES];
@@ skipping 21 matching lines @@
         syncPromoHeight - [syncPromoController_ borderWidth];
     [[self window] setFrame:bubbleFrame display:YES];
   }
 }
 
 // If this is a new bookmark somewhere visible (e.g. on the bookmark
 // bar), pulse it.  Else, call ourself recursively with our parent
 // until we find something visible to pulse.
 - (void)startPulsingBookmarkButton:(const BookmarkNode*)node  {
   while (node) {
-    if ((node->parent() == client_->model()->bookmark_bar_node()) ||
+    if ((node->parent() == model_->bookmark_bar_node()) ||
         (node->parent() == client_->managed_node()) ||
-        (node == client_->model()->other_node())) {
+        (node == model_->other_node())) {
       pulsingBookmarkNode_ = node;
       bookmarkObserver_->StartObservingNode(pulsingBookmarkNode_);
       NSValue *value = [NSValue valueWithPointer:node];
       NSDictionary *dict = [NSDictionary
                              dictionaryWithObjectsAndKeys:value,
                              bookmark_button::kBookmarkKey,
                              [NSNumber numberWithBool:YES],
                              bookmark_button::kBookmarkPulseFlagKey,
                              nil];
       [[NSNotificationCenter defaultCenter]
@@ skipping 71 matching lines @@
         l10n_util::GetNSString(IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARKED);
     [bigTitle_ setStringValue:title];
   }
 
   [self fillInFolderList];
 
   // Ping me when things change out from under us.  Unlike a normal
   // dialog, the bookmark bubble's cancel: means "don't add this as a
   // bookmark", not "cancel editing".  We must take extra care to not
   // touch the bookmark in this selector.
-  bookmarkObserver_.reset(new BookmarkModelObserverForCocoa(
-      client_->model(),
-      ^(BOOL nodeWasDeleted) {
+  bookmarkObserver_.reset(
+      new BookmarkModelObserverForCocoa(model_, ^(BOOL nodeWasDeleted) {
           // If a watched node was deleted, the pointer to the pulsing button
           // is likely stale.
           if (nodeWasDeleted)
             pulsingBookmarkNode_ = NULL;
           [self dismissWithoutEditing:nil];
       }));
   bookmarkObserver_->StartObservingNode(node_);
 
   // Pulse something interesting on the bookmark bar.
   [self startPulsingBookmarkButton:node_];
@@ skipping 35 matching lines @@
   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(client_->model(), node_->url());
+  bookmark_utils::RemoveAllBookmarks(model_, node_->url());
   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
@@ skipping 25 matching lines @@
 
 // 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]) {
-    client_->model()->SetTitle(node_, base::SysNSStringToUTF16(newTitle));
+    model_->SetTitle(node_, base::SysNSStringToUTF16(newTitle));
     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();
-    client_->model()->Move(node_, newParent, index);
+    model_->Move(node_, newParent, index);
     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:client_->model()->root_node()
+  [self addFolderNodes:model_->root_node()
          toPopUpButton:folderPopUpButton_
            indentation:0];
   NSMenu* menu = [folderPopUpButton_ menu];
   NSString* title = [[self class] chooseAnotherFolderString];
   NSMenuItem *item = [menu addItemWithTitle:title
                                      action:NULL
                               keyEquivalent:@""];
   ChooseAnotherFolder* obj = [[self class] chooseAnotherFolderObject];
   [item setRepresentedObject:obj];
   // Finally, select the current parent.
@@ skipping 14 matching lines @@
 + (NSString*)chooseAnotherFolderString {
   return l10n_util::GetNSStringWithFixup(
       IDS_BOOKMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER);
 }
 
 // For the given folder node, walk the tree and add folder names to
 // the given pop up button.
 - (void)addFolderNodes:(const BookmarkNode*)parent
          toPopUpButton:(NSPopUpButton*)button
            indentation:(int)indentation {
-  if (!client_->model()->is_root_node(parent))  {
+  if (!model_->is_root_node(parent)) {
     NSString* title = base::SysUTF16ToNSString(parent->GetTitle());
     NSMenu* menu = [button menu];
     NSMenuItem* item = [menu addItemWithTitle:title
                                        action:NULL
                                 keyEquivalent:@""];
     [item setRepresentedObject:[NSValue valueWithPointer:parent]];
     [item setIndentationLevel:indentation];
     ++indentation;
   }
   for (int i = 0; i < parent->child_count(); i++) {
@@ skipping 22 matching lines @@
   NSInteger idx = [menu indexOfItemWithRepresentedObject:parentValue];
   DCHECK(idx != -1);
   [folderPopUpButton_ selectItemAtIndex:idx];
 }
 
 - (NSPopUpButton*)folderPopUpButton {
   return folderPopUpButton_;
 }
 
 @end  // implementation BookmarkBubbleController(ExposedForUnitTesting)