Introduce ChromeBookmarkClientFactory

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"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "chrome/browser/bookmarks/bookmark_stats.h"
-#include "chrome/browser/bookmarks/chrome_bookmark_client.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar_instructions_delegate.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view_observer.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_observer.h"
 #include "chrome/browser/ui/views/detachable_toolbar_view.h"
 #include "components/bookmarks/browser/bookmark_model_observer.h"
 #include "components/bookmarks/browser/bookmark_node_data.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/views/context_menu_controller.h"
 #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 BookmarkContextMenu;
+class BookmarkModel;
 class Browser;
 class BrowserView;
 class ChromeBookmarkClient;
 class Profile;
 
 namespace content {
 class PageNavigator;
 }
 
 namespace gfx {
@@ skipping 227 matching lines @@
   enum DropButtonType {
     DROP_BOOKMARK,
     DROP_OTHER_FOLDER,
     DROP_OVERFLOW
   };
 
   // Creates recent bookmark button and when visible button as well as
   // calculating the preferred height.
   void Init();
 
-  BookmarkModel* model() { return client_->model(); }
-
   // NOTE: unless otherwise stated all methods that take an int for an index are
   // in terms of the bookmark bar view. Typically the view index and model index
   // are the same, but they may differ during animations or drag and drop.
   //
   // It's easy to get the mapping wrong. For this reason all these methods are
   // private.
 
   // Returns the number of buttons corresponding to starred urls/folders. This
   // is equivalent to the number of children the bookmark bar node from the
   // bookmark bar model has.
@@ skipping 89 matching lines @@
 
   // Updates the visibility of the apps shortcut based on the pref value.
   void OnAppsPageShortcutVisibilityPrefChanged();
 
   // Needed to react to kShowAppsShortcutInBookmarkBar changes.
   PrefChangeRegistrar profile_pref_registrar_;
 
   // Used for opening urls.
   content::PageNavigator* page_navigator_;
 
-  // ChromeBookmarkClient that owns the model whose entries and folders are
-  // shown in this view. This is owned by the Profile.
+  // BookmarkModel that owns the entries and folders that are shown in this
+  // view. This is owned by the Profile.
+  BookmarkModel* model_;
+
+  // ChromeBookmarkClient. This is owned by the Profile.
   ChromeBookmarkClient* client_;
 
   // 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 42 matching lines @@
 
   BookmarkBar::State bookmark_bar_state_;
 
   // Are we animating to or from the detached state?
   bool animating_detached_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_