Index: chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm |
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm |
index ef54b4506e18189e722302b81b6ff1fa5e9d5151..b1f3f8c75874366bc020707449d7b2b9651f534f 100644 |
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm |
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm |
@@ -37,6 +37,7 @@ |
#import "chrome/browser/ui/cocoa/profile_menu_button.h" |
#import "chrome/browser/ui/cocoa/tab_contents/favicon_util.h" |
#import "chrome/browser/ui/cocoa/tabs/tab_controller.h" |
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.h" |
#import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h" |
#import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" |
#import "chrome/browser/ui/cocoa/tabs/tab_view.h" |
@@ -359,6 +360,8 @@ class NotificationBridge : public NotificationObserver { |
hoverTabSelector_.reset(new HoverTabSelector(tabStripModel_)); |
delegate_ = delegate; |
bridge_.reset(new TabStripModelObserverBridge(tabStripModel_, self)); |
+ dragController_.reset( |
+ [[TabStripDragController alloc] initWithTabStripController:self]); |
tabContentsArray_.reset([[NSMutableArray alloc] init]); |
tabArray_.reset([[NSMutableArray alloc] init]); |
NSWindow* browserWindow = [view window]; |
@@ -811,6 +814,11 @@ class NotificationBridge : public NotificationObserver { |
return new TabMenuModel(delegate, tabStripModel_, index); |
} |
+// Returns a weak reference to the controller that manages dragging of tabs. |
+- (id<TabDraggingEventTarget>)dragController { |
+ return dragController_.get(); |
+} |
+ |
- (void)insertPlaceholderForTab:(TabView*)tab |
frame:(NSRect)frame |
yStretchiness:(CGFloat)yStretchiness { |