chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm - Issue 10827060: Removing instances of profile_->GetBookmarkModel() as part of converting BookmarkModel to a PKS.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

Issue 10827060: 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 | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

===================================================================

--- chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm (revision 148477)

+++ chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm (working copy)

@@ -10,6 +10,7 @@

#include "base/sys_string_conversions.h"

#include "chrome/browser/bookmarks/bookmark_editor.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/extensions/extension_service.h"

#include "chrome/browser/prefs/incognito_mode_prefs.h"

@@ -242,7 +243,7 @@

browser_ = browser;

initialWidth_ = initialWidth;

- bookmarkModel_ = browser_->profile()->GetBookmarkModel();

+ bookmarkModel_ = BookmarkModelFactory::GetForProfile(browser_->profile());

buttons_.reset([[NSMutableArray alloc] init]);

delegate_ = delegate;

resizeDelegate_ = resizeDelegate;