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

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

Issue 10827047: Removing instances of profile_->GetBookmarkModel() as part of converting BookmarkModel to a PKS. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
===================================================================
--- chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc (revision 148477)
+++ chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc (working copy)
@@ -15,6 +15,7 @@
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/bookmarks/bookmark_utils.h"
#include "chrome/browser/browser_shutdown.h"
#include "chrome/browser/defaults.h"
@@ -1090,7 +1091,7 @@
}
Profile* profile = browser_->profile();
bool close_on_remove =
- (parent == profile->GetBookmarkModel()->other_node()) &&
+ (parent == BookmarkModelFactory::GetForProfile(profile)->other_node()) &&
(parent->child_count() == 1);
context_menu_.reset(new BookmarkContextMenu(GetWidget(), browser_, profile,
chrome::GetActiveWebContents(browser_), parent, nodes, close_on_remove));
@@ -1162,7 +1163,7 @@
registrar_.Add(this, chrome::NOTIFICATION_BOOKMARK_BUBBLE_SHOWN, ns_source);
registrar_.Add(this, chrome::NOTIFICATION_BOOKMARK_BUBBLE_HIDDEN, ns_source);
- model_ = profile->GetBookmarkModel();
+ model_ = BookmarkModelFactory::GetForProfile(profile);
if (model_) {
model_->AddObserver(this);
if (model_->IsLoaded())
« no previous file with comments | « no previous file | chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698