Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(409)

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view.h

Issue 321553004: Cleanup redundant model_ field in BookmarkBarView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
index b572d1398b745eb4622aafd1f1fb86beeb75bf1a..7367c9543746e58c10699ce974ddc01b74d8d9df 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
@@ -6,7 +6,6 @@
#define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
#include <set>
-#include <string>
#include "base/basictypes.h"
#include "base/compiler_specific.h"
@@ -14,6 +13,7 @@
#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"
@@ -272,6 +272,8 @@ class BookmarkBarView : public DetachableToolbarView,
DROP_OVERFLOW
};
+ BookmarkModel* model() { return client_->model(); }
sky 2014/06/06 19:49:20 nit: move after Init() (I view init similar to a c
Joao da Silva 2014/06/06 20:12:18 Done.
+
// Creates recent bookmark button and when visible button as well as
// calculating the preferred height.
void Init();
@@ -385,11 +387,8 @@ class BookmarkBarView : public DetachableToolbarView,
// Used for opening urls.
content::PageNavigator* page_navigator_;
- // Model providing details as to the starred entries/folders that should be
- // shown. This is owned by the Profile.
- BookmarkModel* model_;
-
- // The ChromeBookmarkClient that owns the |model_|.
+ // ChromeBookmarkClient that owns the model whose entries and folders are
+ // shown in this view. This is owned by the Profile.
ChromeBookmarkClient* client_;
// Used to manage showing a Menu, either for the most recently bookmarked

Powered by Google App Engine
This is Rietveld 408576698