| Index: chrome/browser/cocoa/tab_view.mm
|
| diff --git a/chrome/browser/cocoa/tab_view.mm b/chrome/browser/cocoa/tab_view.mm
|
| index 811e3d6985cb228d0ed18a630a61d0e31861a602..cf39163fc97c016d017c62b56f480e998d9b41da 100644
|
| --- a/chrome/browser/cocoa/tab_view.mm
|
| +++ b/chrome/browser/cocoa/tab_view.mm
|
| @@ -284,8 +284,6 @@ const CGFloat kRapidCloseDist = 2.5;
|
| [NSApp nextEventMatchingMask:NSLeftMouseUpMask | NSLeftMouseDraggedMask
|
| untilDate:[NSDate distantFuture]
|
| inMode:NSDefaultRunLoopMode dequeue:YES];
|
| - NSPoint thisPoint = [NSEvent mouseLocation];
|
| -
|
| NSEventType type = [theEvent type];
|
| if (type == NSLeftMouseDragged) {
|
| [self mouseDragged:theEvent];
|
| @@ -339,7 +337,6 @@ const CGFloat kRapidCloseDist = 2.5;
|
| tabWasDragged_ = YES;
|
|
|
| if (draggingWithinTabStrip_) {
|
| - NSRect frame = [self frame];
|
| NSPoint thisPoint = [NSEvent mouseLocation];
|
| CGFloat stretchiness = thisPoint.y - dragOrigin_.y;
|
| stretchiness = copysign(sqrtf(fabs(stretchiness))/sqrtf(kTearDistance),
|
| @@ -366,9 +363,6 @@ const CGFloat kRapidCloseDist = 2.5;
|
| }
|
| }
|
|
|
| - NSPoint lastPoint =
|
| - [[theEvent window] convertBaseToScreen:[theEvent locationInWindow]];
|
| -
|
| // Do not start dragging until the user has "torn" the tab off by
|
| // moving more than 3 pixels.
|
| NSDate* targetDwellDate = nil; // The date this target was first chosen.
|
| @@ -502,7 +496,6 @@ const CGFloat kRapidCloseDist = 2.5;
|
|
|
| // Compute where placeholder should go and insert it into the
|
| // destination tab strip.
|
| - NSRect dropTabFrame = [[targetController_ tabStripView] frame];
|
| TabView* draggedTabView = (TabView*)[draggedController_ selectedTabView];
|
| NSRect tabFrame = [draggedTabView frame];
|
| tabFrame.origin = [dragWindow_ convertBaseToScreen:tabFrame.origin];
|
| @@ -510,9 +503,6 @@ const CGFloat kRapidCloseDist = 2.5;
|
| convertScreenToBase:tabFrame.origin];
|
| tabFrame = [[targetController_ tabStripView]
|
| convertRect:tabFrame fromView:nil];
|
| - NSPoint point =
|
| - [sourceWindow_ convertBaseToScreen:
|
| - [draggedTabView convertPoint:NSZeroPoint toView:nil]];
|
| [targetController_ insertPlaceholderForTab:self
|
| frame:tabFrame
|
| yStretchiness:0];
|
|
|