Fix componentization of chrome/browser/bookmarks

chrome/browser/ui/views/bookmarks/bookmark_bar_view.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_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
 
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 15 matching lines @@
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/controls/menu/menu_types.h"
 #include "ui/views/drag_controller.h"
 
 class BookmarkBarViewObserver;
 class BookmarkBarViewTestHelper;
 class BookmarkContextMenu;
 class Browser;
 class BrowserView;
-class ChromeBookmarkClient;
 class Profile;
 
 namespace bookmarks {
 class BookmarkModel;
+class ManagedBookmarkService;
 }
 
 namespace content {
 class PageNavigator;
 }
 
 namespace gfx {
 class SlideAnimation;
 }
 
@@ skipping 344 matching lines @@
   // Needed to react to kShowAppsShortcutInBookmarkBar changes.
   PrefChangeRegistrar profile_pref_registrar_;
 
   // Used for opening urls.
   content::PageNavigator* page_navigator_;
 
   // BookmarkModel that owns the entries and folders that are shown in this
   // view. This is owned by the Profile.
   bookmarks::BookmarkModel* model_;
 
-  // ChromeBookmarkClient. This is owned by the Profile.
-  ChromeBookmarkClient* client_;
+  // ManagedBookmarkService. This is owned by the Profile.
+  bookmarks::ManagedBookmarkService* managed_;
 
   // Used to manage showing a Menu, either for the most recently bookmarked
   // entries, or for the starred folder.
   BookmarkMenuController* bookmark_menu_;
 
   // Used when showing a menu for drag and drop. That is, if the user drags
   // over a folder this becomes non-null and manages the menu showing the
   // contents of the node.
   BookmarkMenuController* bookmark_drop_menu_;
 
@@ skipping 46 matching lines @@
 
   base::ObserverList<BookmarkBarViewObserver> observers_;
 
   // Factory used to delay showing of the drop menu.
   base::WeakPtrFactory<BookmarkBarView> show_folder_method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_