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

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.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
Index: chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc
===================================================================
--- chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc (revision 148477)
+++ chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc (working copy)
@@ -7,6 +7,7 @@
#include "base/stl_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_node_data.h"
#include "chrome/browser/bookmarks/bookmark_utils.h"
#include "chrome/browser/event_disposition.h"
@@ -60,7 +61,8 @@
gfx::Rect bounds(screen_loc.x(), screen_loc.y(), menu_button->width(),
menu_button->height() - 1);
for_drop_ = for_drop;
- menu_delegate_->profile()->GetBookmarkModel()->AddObserver(this);
+ BookmarkModelFactory::GetForProfile(
+ menu_delegate_->profile())->AddObserver(this);
// We only delete ourself after the menu completes, so we can safely ignore
// the return value.
ignore_result(menu_runner_->RunMenuAt(menu_delegate_->parent(), menu_button,
@@ -188,7 +190,8 @@
}
BookmarkMenuController::~BookmarkMenuController() {
- menu_delegate_->profile()->GetBookmarkModel()->RemoveObserver(this);
+ BookmarkModelFactory::GetForProfile(
+ menu_delegate_->profile())->RemoveObserver(this);
if (observer_)
observer_->BookmarkMenuDeleted(this);
}

Powered by Google App Engine
This is Rietveld 408576698