chrome/browser/ui/cocoa/browser_window_controller.mm - Issue 10823050: 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/browser_window_controller.mm

Issue 10823050: 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/applescript/bookmark_node_applescript.mm ('k') | chrome/browser/ui/cocoa/view_id_util_browsertest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/browser_window_controller.mm

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

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

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

@@ -14,6 +14,7 @@

#include "base/sys_string_conversions.h"

#include "chrome/app/chrome_command_ids.h" // IDC_*

#include "chrome/browser/bookmarks/bookmark_editor.h"

+#include "chrome/browser/bookmarks/bookmark_model_factory.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/instant/instant_controller.h"

#include "chrome/browser/managed_mode.h"

@@ -1603,7 +1604,8 @@

- (void)showBookmarkBubbleForURL:(const GURL&)url

alreadyBookmarked:(BOOL)alreadyMarked {

if (!bookmarkBubbleController_) {

- BookmarkModel* model = browser_->profile()->GetBookmarkModel();

+ BookmarkModel* model =

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

const BookmarkNode* node = model->GetMostRecentlyAddedNodeForURL(url);

bookmarkBubbleController_ =

[[BookmarkBubbleController alloc] initWithParentWindow:[self window]