Chromium Code Reviews| Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm |
| diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm |
| index 9a9f4a75793065e4356fa131a71276d58efc6c40..881c77b94ea06cbb7e31fc1968d9384dcee6cfcd 100644 |
| --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm |
| +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm |
| @@ -2371,10 +2371,9 @@ 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(browser_->profile())); |
| dragDataNodes.assign(nodes.begin(), nodes.end()); |
| } |
| return dragDataNodes; |
| @@ -2470,7 +2469,8 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) { |
| folderController_ = |
| [[BookmarkBarFolderController alloc] initWithParentButton:parentButton |
| parentController:nil |
| - barController:self]; |
| + barController:self |
| + profile:browser_->profile()]; |
|
Alexei Svitkine (slow)
2013/03/27 15:16:39
Align :'s. If it doesn't fit, add a newline before
tfarina
2013/03/27 21:02:27
Done.
|
| [folderController_ showWindow:self]; |
| // Only BookmarkBarController has this; the |