chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.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/bookmarks/bookmark_editor_base_controller.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

« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

--- chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm (revision 149630)

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

@@ -12,6 +12,7 @@

#include "base/mac/mac_util.h"

#include "base/sys_string_conversions.h"

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

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

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

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h"

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_cell_single_line.h"

@@ -297,7 +298,7 @@

#pragma mark Folder Tree Management

- (BookmarkModel*)bookmarkModel {

- return profile_->GetBookmarkModel();

+ return BookmarkModelFactory::GetForProfile(profile_);

}

- (Profile*)profile {

@@ -436,7 +437,7 @@

// of ancestor nodes. Then crawl down the folderTreeArray looking

// for each ancestor in order while building up the selectionPath.

std::stack<const BookmarkNode*> nodeStack;

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

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

const BookmarkNode* rootNode = model->root_node();

const BookmarkNode* node = desiredNode;

while (node != rootNode) {

@@ -491,7 +492,7 @@

- (void)buildFolderTree {

// Build up a tree of the current folder configuration.

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

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

const BookmarkNode* rootNode = model->root_node();

NSMutableArray* baseArray = [self addChildFoldersFromNode:rootNode];

DCHECK(baseArray);