Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5834)

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

Issue 12891006: bookmarks: Remove Profile getter accessor from BookmarkModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cocoa alignments Created 7 years, 9 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_controller.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
index a151ef2337d6ba2704676e5e0bb0e9107407ab01..f7d87a9cb31918d4ac73c14d3b71356cb4ea7e0d 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
@@ -209,7 +209,8 @@ class BookmarkBarFolderControllerTest : public CocoaProfileTest {
[[BookmarkBarFolderControllerPong alloc]
initWithParentButton:parentButton
parentController:nil
- barController:bar_];
+ barController:bar_
+ profile:profile()];
[c window]; // Force nib load.
return c;
}
@@ -267,7 +268,8 @@ TEST_F(BookmarkBarFolderControllerTest, BasicPosition) {
bbfc.reset([[BookmarkBarFolderController alloc]
initWithParentButton:parentButton
parentController:nil
- barController:bar_]);
+ barController:bar_
+ profile:profile()]);
[bbfc window];
NSPoint pt = [bbfc windowTopLeftForWidth:0 height:100]; // screen coords
NSPoint buttonOriginInWindow =
@@ -291,7 +293,8 @@ TEST_F(BookmarkBarFolderControllerTest, BasicPosition) {
bbfc2.reset([[BookmarkBarFolderController alloc]
initWithParentButton:[[bbfc buttons] objectAtIndex:0]
parentController:bbfc.get()
- barController:bar_]);
+ barController:bar_
+ profile:profile()]);
[bbfc2 window];
pt = [bbfc2 windowTopLeftForWidth:0 height:100];
// We're now overlapping the window a bit.
@@ -327,7 +330,8 @@ TEST_F(BookmarkBarFolderControllerTest, PositionRightLeftRight) {
[[BookmarkBarFolderControllerNoLevel alloc]
initWithParentButton:parentButton
parentController:parentController
- barController:bar_];
+ barController:bar_
+ profile:profile()];
[folder_controller_array addObject:bbfcl];
[bbfcl autorelease];
[bbfcl window];
@@ -1316,10 +1320,12 @@ TEST_F(BookmarkBarFolderControllerMenuTest, HoverThenDeleteBookmark) {
- (id)initWithParentButton:(BookmarkButton*)button
parentController:(BookmarkBarFolderController*)parentController
- barController:(BookmarkBarController*)barController {
+ barController:(BookmarkBarController*)barController
+ profile:(Profile*)profile {
if ((self = [super initWithParentButton:button
parentController:parentController
- barController:barController])) {
+ barController:barController
+ profile:profile])) {
dragDataNode_ = NULL;
}
return self;
@@ -1362,7 +1368,8 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragBookmarkData) {
folderController.reset([[BookmarkBarFolderControllerDragData alloc]
initWithParentButton:button
parentController:nil
- barController:bar_]);
+ barController:bar_
+ profile:profile()]);
BookmarkButton* targetButton =
[folderController buttonWithTitleEqualTo:@"2f1b"];
ASSERT_TRUE(targetButton);
@@ -1420,7 +1427,8 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragBookmarkDataToTrash) {
folderController.reset([[BookmarkBarFolderControllerDragData alloc]
initWithParentButton:button
parentController:nil
- barController:bar_]);
+ barController:bar_
+ profile:profile()]);
// Drag a button to the trash.
BookmarkButton* buttonToDelete =
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698