chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm - Issue 10834161: 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/applescript/browsercrapplication+applescript.mm

Issue 10834161: 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, 4 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/cocoa/applescript/browsercrapplication+applescript.mm

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

--- chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm (revision 149630)

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

@@ -8,6 +8,7 @@

#import "base/memory/scoped_nsobject.h"

#import "chrome/browser/app_controller_mac.h"

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

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

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/browser_list.h"

@@ -76,7 +77,7 @@

return nil;

}

- BookmarkModel* model = lastProfile->GetBookmarkModel();

+ BookmarkModel* model = BookmarkModelFactory::GetForProfile(lastProfile);

if (!model->IsLoaded()) {

AppleScript::SetError(AppleScript::errBookmarkModelLoad);

return nil;

@@ -99,7 +100,7 @@

return nil;

}

- BookmarkModel* model = lastProfile->GetBookmarkModel();

+ BookmarkModel* model = BookmarkModelFactory::GetForProfile(lastProfile);

if (!model->IsLoaded()) {

AppleScript::SetError(AppleScript::errBookmarkModelLoad);

return NULL;

« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm » ('j') | no next file with comments »