OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" | 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" |
6 | 6 |
7 #include "base/mac/bundle_locations.h" | 7 #include "base/mac/bundle_locations.h" |
8 #include "base/mac/mac_util.h" | 8 #include "base/mac/mac_util.h" |
9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
10 #include "base/sys_string_conversions.h" | 10 #include "base/sys_string_conversions.h" |
(...skipping 2660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2671 | 2671 |
2672 // No longer need to hold the lock; the folderController_ now owns it. | 2672 // No longer need to hold the lock; the folderController_ now owns it. |
2673 [browserController releaseBarVisibilityForOwner:self | 2673 [browserController releaseBarVisibilityForOwner:self |
2674 withAnimation:NO | 2674 withAnimation:NO |
2675 delay:NO]; | 2675 delay:NO]; |
2676 } | 2676 } |
2677 | 2677 |
2678 - (void)openAll:(const BookmarkNode*)node | 2678 - (void)openAll:(const BookmarkNode*)node |
2679 disposition:(WindowOpenDisposition)disposition { | 2679 disposition:(WindowOpenDisposition)disposition { |
2680 [self closeFolderAndStopTrackingMenus]; | 2680 [self closeFolderAndStopTrackingMenus]; |
2681 chrome::OpenAll([[self view] window], browser_, node, disposition); | 2681 chrome::OpenAll([[self view] window], browser_, node, disposition, |
| 2682 browser_->profile()); |
2682 } | 2683 } |
2683 | 2684 |
2684 - (void)addButtonForNode:(const BookmarkNode*)node | 2685 - (void)addButtonForNode:(const BookmarkNode*)node |
2685 atIndex:(NSInteger)buttonIndex { | 2686 atIndex:(NSInteger)buttonIndex { |
2686 int newOffset = 0; | 2687 int newOffset = 0; |
2687 if (buttonIndex == -1) | 2688 if (buttonIndex == -1) |
2688 buttonIndex = [buttons_ count]; // New button goes at the end. | 2689 buttonIndex = [buttons_ count]; // New button goes at the end. |
2689 if (buttonIndex <= (NSInteger)[buttons_ count]) { | 2690 if (buttonIndex <= (NSInteger)[buttons_ count]) { |
2690 if (buttonIndex) { | 2691 if (buttonIndex) { |
2691 BookmarkButton* targetButton = [buttons_ objectAtIndex:buttonIndex - 1]; | 2692 BookmarkButton* targetButton = [buttons_ objectAtIndex:buttonIndex - 1]; |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2847 // to minimize touching the object passed in (likely a mock). | 2848 // to minimize touching the object passed in (likely a mock). |
2848 - (void)setButtonContextMenu:(id)menu { | 2849 - (void)setButtonContextMenu:(id)menu { |
2849 buttonContextMenu_ = menu; | 2850 buttonContextMenu_ = menu; |
2850 } | 2851 } |
2851 | 2852 |
2852 - (void)setIgnoreAnimations:(BOOL)ignore { | 2853 - (void)setIgnoreAnimations:(BOOL)ignore { |
2853 ignoreAnimations_ = ignore; | 2854 ignoreAnimations_ = ignore; |
2854 } | 2855 } |
2855 | 2856 |
2856 @end | 2857 @end |
OLD | NEW |