| 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..3efe518b8a2212ff147c406d66192d1f34ce2d65 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;
|
| @@ -2468,9 +2467,11 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
|
|
|
| // Folder controller, like many window controllers, owns itself.
|
| folderController_ =
|
| - [[BookmarkBarFolderController alloc] initWithParentButton:parentButton
|
| - parentController:nil
|
| - barController:self];
|
| + [[BookmarkBarFolderController alloc]
|
| + initWithParentButton:parentButton
|
| + parentController:nil
|
| + barController:self
|
| + profile:browser_->profile()];
|
| [folderController_ showWindow:self];
|
|
|
| // Only BookmarkBarController has this; the
|
|
|