OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/cocoa/bookmark_bar_folder_controller.h" | 5 #import "chrome/browser/cocoa/bookmark_bar_folder_controller.h" |
6 #include "base/mac_util.h" | 6 #include "base/mac_util.h" |
7 #include "base/sys_string_conversions.h" | 7 #include "base/sys_string_conversions.h" |
8 #include "chrome/browser/bookmarks/bookmark_model.h" | 8 #include "chrome/browser/bookmarks/bookmark_model.h" |
9 #include "chrome/browser/bookmarks/bookmark_utils.h" | 9 #include "chrome/browser/bookmarks/bookmark_utils.h" |
10 #import "chrome/browser/browser_theme_provider.h" | 10 #import "chrome/browser/browser_theme_provider.h" |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 hoverState_.reset([[BookmarkBarFolderHoverState alloc] init]); | 77 hoverState_.reset([[BookmarkBarFolderHoverState alloc] init]); |
78 if (scrollable_) | 78 if (scrollable_) |
79 [self addOrUpdateScrollTracking]; | 79 [self addOrUpdateScrollTracking]; |
80 } | 80 } |
81 return self; | 81 return self; |
82 } | 82 } |
83 | 83 |
84 - (void)dealloc { | 84 - (void)dealloc { |
85 [self removeScrollTracking]; | 85 [self removeScrollTracking]; |
86 [self endScroll]; | 86 [self endScroll]; |
| 87 [hoverState_ draggingExited]; |
87 // Note: we don't need to | 88 // Note: we don't need to |
88 // [NSObject cancelPreviousPerformRequestsWithTarget:self]; | 89 // [NSObject cancelPreviousPerformRequestsWithTarget:self]; |
89 // Because all of our performSelector: calls use withDelay: which | 90 // Because all of our performSelector: calls use withDelay: which |
90 // retains us. | 91 // retains us. |
91 [super dealloc]; | 92 [super dealloc]; |
92 } | 93 } |
93 | 94 |
94 // Overriden from NSWindowController to call childFolderWillShow: before showing | 95 // Overriden from NSWindowController to call childFolderWillShow: before showing |
95 // the window. | 96 // the window. |
96 - (void)showWindow:(id)sender { | 97 - (void)showWindow:(id)sender { |
(...skipping 799 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
896 - (IBAction)openBookmarkInNewForegroundTab:(id)sender { | 897 - (IBAction)openBookmarkInNewForegroundTab:(id)sender { |
897 [barController_ openBookmarkInNewForegroundTab:sender]; | 898 [barController_ openBookmarkInNewForegroundTab:sender]; |
898 } | 899 } |
899 | 900 |
900 - (IBAction)openBookmarkInNewWindow:(id)sender { | 901 - (IBAction)openBookmarkInNewWindow:(id)sender { |
901 [barController_ openBookmarkInNewWindow:sender]; | 902 [barController_ openBookmarkInNewWindow:sender]; |
902 } | 903 } |
903 | 904 |
904 | 905 |
905 @end // BookmarkBarFolderController | 906 @end // BookmarkBarFolderController |
OLD | NEW |