Fix componentization of chrome/browser/bookmarks

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_
 #define CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 #include <map>
 
 #import "base/mac/cocoa_protocols.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_state.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "chrome/browser/ui/cocoa/has_weak_browser_pointer.h"
 #include "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h"
 #include "ui/base/window_open_disposition.h"
 
 @class BookmarkBarController;
 @class BookmarkBarFolderController;
 @class BookmarkBarView;
 @class BookmarkButtonCell;
 @class BookmarkFolderTarget;
 @class BookmarkContextMenuCocoaController;
 class Browser;
-class ChromeBookmarkClient;
 class GURL;
 namespace ui {
 class ThemeProvider;
 }
 
 namespace bookmarks {
 
 class BookmarkModel;
 class BookmarkNode;
+class ManagedBookmarkService;
 
 // Magic numbers from Cole
 // TODO(jrg): create an objc-friendly version of bookmark_bar_constants.h?
 
 // Used as a maximum width for buttons on the bar.
 const CGFloat kDefaultBookmarkWidth = 150.0;
 
 // Horizontal frame inset for buttons in the bookmark bar.
 const CGFloat kBookmarkHorizontalPadding = 1.0;
 
@@ skipping 118 matching lines @@
 
   // The "original" state of the bookmark bar if an animation is running.
   BookmarkBar::State lastState_;
 
   // YES if an animation is running.
   BOOL isAnimationRunning_;
 
   Browser* browser_;              // weak; owned by its window
   bookmarks::BookmarkModel* bookmarkModel_;  // weak; part of the profile owned
                                              // by the top-level Browser object.
-  ChromeBookmarkClient* bookmarkClient_;
+  bookmarks::ManagedBookmarkService* managedBookmarkService_;
 
   // Our initial view width, which is applied in awakeFromNib.
   CGFloat initialWidth_;
 
   // BookmarkNodes have a 64bit id.  NSMenuItems have a 32bit tag used
   // to represent the bookmark node they refer to.  This map provides
   // a mapping from one to the other, so we can properly identify the
   // node from the item.  When adding items in, we start with seedId_.
   int32 seedId_;
   std::map<int32,int64> menuTagMap_;
@@ skipping 235 matching lines @@
 - (BookmarkButton*)buttonForDroppingOnAtPoint:(NSPoint)point;
 - (BOOL)isEventAnExitEvent:(NSEvent*)event;
 - (BOOL)shrinkOrHideView:(NSView*)view forMaxX:(CGFloat)maxViewX;
 - (void)unhighlightBookmark:(const bookmarks::BookmarkNode*)node;
 
 // The following are for testing purposes only and are not used internally.
 - (NSMenu *)menuForFolderNode:(const bookmarks::BookmarkNode*)node;
 @end
 
 #endif  // CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_