Chromium Code Reviews| Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm |
| diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm |
| index 78b30bd654ea73fbf74699977ab3ca542b48b709..6add27154f956f9a0c847c3ceb65aeaae7e5ea57 100644 |
| --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm |
| +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm |
| @@ -235,7 +235,8 @@ struct LayoutMetrics { |
| - (id)initWithParentButton:(BookmarkButton*)button |
| parentController:(BookmarkBarFolderController*)parentController |
| - barController:(BookmarkBarController*)barController { |
| + barController:(BookmarkBarController*)barController |
| + profile:(Profile*)profile { |
|
Alexei Svitkine (slow)
2013/03/27 15:16:39
align the :'s
tfarina
2013/03/27 21:02:27
Done.
|
| NSString* nibPath = |
| [base::mac::FrameworkBundle() pathForResource:@"BookmarkBarFolderWindow" |
| ofType:@"nib"]; |
| @@ -243,6 +244,8 @@ struct LayoutMetrics { |
| parentButton_.reset([button retain]); |
| selectedIndex_ = -1; |
| + profile_ = profile; |
| + |
| // We want the button to remain bordered as part of the menu path. |
| [button forceButtonBorderToStayOnAlways:YES]; |
| @@ -1462,10 +1465,8 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) { |
| - (std::vector<const BookmarkNode*>)retrieveBookmarkNodeData { |
| std::vector<const BookmarkNode*> dragDataNodes; |
| BookmarkNodeData dragData; |
| - if(dragData.ReadFromDragClipboard()) { |
| - BookmarkModel* bookmarkModel = [self bookmarkModel]; |
| - Profile* profile = bookmarkModel->profile(); |
| - std::vector<const BookmarkNode*> nodes(dragData.GetNodes(profile)); |
| + if (dragData.ReadFromDragClipboard()) { |
| + std::vector<const BookmarkNode*> nodes(dragData.GetNodes(profile_)); |
| dragDataNodes.assign(nodes.begin(), nodes.end()); |
| } |
| return dragDataNodes; |
| @@ -1731,7 +1732,8 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) { |
| folderController_ = |
| [[BookmarkBarFolderController alloc] initWithParentButton:parentButton |
| parentController:self |
| - barController:barController_]; |
| + barController:barController_ |
| + profile:profile_]; |
|
Alexei Svitkine (slow)
2013/03/27 15:16:39
Align the :'s
tfarina
2013/03/27 21:02:27
Done.
|
| [folderController_ showWindow:self]; |
| } |