chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_unittest.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_view_unittest.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_controller.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_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_bar_view_unittest.mm

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

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

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

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

#include "base/string16.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/profiles/profile.h"

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

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

@@ -212,7 +213,8 @@

[view_ setController:info.get()];

[info reset];

- BookmarkModel* bookmark_model = profile()->GetBookmarkModel();

+ BookmarkModel* bookmark_model =

+ BookmarkModelFactory::GetForProfile(profile());

const BookmarkNode* node =

bookmark_model->AddURL(bookmark_model->bookmark_bar_node(),

@@ -251,7 +253,8 @@

other_profile->CreateBookmarkModel(true);

other_profile->BlockUntilBookmarkModelLoaded();

- BookmarkModel* bookmark_model = profile()->GetBookmarkModel();

+ BookmarkModel* bookmark_model =

+ BookmarkModelFactory::GetForProfile(profile());

const BookmarkNode* node =

bookmark_model->AddURL(bookmark_model->bookmark_bar_node(),

@@ -268,7 +271,7 @@

[info setDraggingSource:dragged_button.get()];

[info setDragDataType:kBookmarkButtonDragType];

[info setButton:dragged_button.get()];

- [info setBookmarkModel:other_profile->GetBookmarkModel()];

+ [info setBookmarkModel:BookmarkModelFactory::GetForProfile(other_profile)];

EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationMove);

EXPECT_TRUE([view_ performDragOperation:(id)info.get()]);

EXPECT_TRUE([info dragButtonToPong]);