Fix componentization of chrome/browser/bookmarks

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

 // 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 <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h"
 
-class ChromeBookmarkClient;
 @class BookmarkBubbleController;
 @class BookmarkSyncPromoController;
 
 namespace bookmarks {
 class BookmarkModel;
 class BookmarkNode;
+class ManagedBookmarkService;
 }
 
 // Controller for the bookmark bubble.  The bookmark bubble is a
 // bubble that pops up when clicking on the STAR next to the URL to
 // add or remove it as a bookmark.  This bubble allows for editing of
 // the bookmark in various ways (name, folder, etc.)
 @interface BookmarkBubbleController : BaseBubbleController {
  @private
-  // |client_|, |model_| and |node_| are weak and owned by the current browser's
-  // profile.
-  ChromeBookmarkClient* client_;  // weak
+  // |managed_|, |model_| and |node_| are weak and owned by the current
+  // browser's profile.
+  bookmarks::ManagedBookmarkService* managed_;  // weak
   bookmarks::BookmarkModel* model_;  // weak
   const bookmarks::BookmarkNode* node_;  // weak
 
   // The bookmark node whose button we asked to pulse.
   const bookmarks::BookmarkNode* pulsingBookmarkNode_;  // weak
 
   BOOL alreadyBookmarked_;
 
   // Ping me when the bookmark model changes out from under us.
   scoped_ptr<BookmarkModelObserverForCocoa> bookmarkObserver_;
 
   // Sync promo controller, if the sync promo is displayed.
   base::scoped_nsobject<BookmarkSyncPromoController> syncPromoController_;
 
   IBOutlet NSTextField* bigTitle_;   // "Bookmark" or "Bookmark Added!"
   IBOutlet NSTextField* nameTextField_;
   IBOutlet NSPopUpButton* folderPopUpButton_;
   IBOutlet NSView* syncPromoPlaceholder_;
 }
 
 @property(readonly, nonatomic) const bookmarks::BookmarkNode* node;
 
 // |node| is the bookmark node we edit in this bubble.
 // |alreadyBookmarked| tells us if the node was bookmarked before the
 //   user clicked on the star.  (if NO, this is a brand new bookmark).
 // The owner of this object is responsible for showing the bubble if
 // it desires it to be visible on the screen.  It is not shown by the
 // init routine.  Closing of the window happens implicitly on dealloc.
 - (id)initWithParentWindow:(NSWindow*)parentWindow
-                    client:(ChromeBookmarkClient*)client
+                   managed:(bookmarks::ManagedBookmarkService*)managed
                      model:(bookmarks::BookmarkModel*)model
                       node:(const bookmarks::BookmarkNode*)node
          alreadyBookmarked:(BOOL)alreadyBookmarked;
 
 // Actions for buttons in the dialog.
 - (IBAction)ok:(id)sender;
 - (IBAction)remove:(id)sender;
 - (IBAction)cancel:(id)sender;
 
 // These actions send a -editBookmarkNode: action up the responder chain.
@@ skipping 10 matching lines @@
 
 - (void)addFolderNodes:(const bookmarks::BookmarkNode*)parent
          toPopUpButton:(NSPopUpButton*)button
            indentation:(int)indentation;
 - (void)setTitle:(NSString*)title
     parentFolder:(const bookmarks::BookmarkNode*)parent;
 - (void)setParentFolderSelection:(const bookmarks::BookmarkNode*)parent;
 + (NSString*)chooseAnotherFolderString;
 - (NSPopUpButton*)folderPopUpButton;
 @end