summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/tab_view.mm
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-11 19:19:37 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-11 19:19:37 +0000
commit227fceeec5b6f83446fa059b700b045f0fc2efd0 (patch)
tree5f07e0efc03308206116a2e8cb9bcacece72f458 /chrome/browser/cocoa/tab_view.mm
parent9631292a32990316f2c950d7e727afda68f7c3b5 (diff)
downloadchromium_src-227fceeec5b6f83446fa059b700b045f0fc2efd0.zip
chromium_src-227fceeec5b6f83446fa059b700b045f0fc2efd0.tar.gz
chromium_src-227fceeec5b6f83446fa059b700b045f0fc2efd0.tar.bz2
Mac/clang: Uncontentious fixes.
* Remove unused variables * Make types in h and cc files agree * Use subclasses if we call subclass methods * Fix one real bug (`if (a); a->foo()`) * Fix forward declarations to be correct * Don't mark some definitions with "extern" Review URL: http://codereview.chromium.org/2730015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49570 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/tab_view.mm')
-rw-r--r--chrome/browser/cocoa/tab_view.mm10
1 files changed, 0 insertions, 10 deletions
diff --git a/chrome/browser/cocoa/tab_view.mm b/chrome/browser/cocoa/tab_view.mm
index 811e3d6..cf39163 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];