Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3020)

Unified Diff: chrome/browser/ui/cocoa/tabs/tab_view.mm

Issue 6821003: [Mac] First pass at multiple selection in the tabstrip. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/tabs/tab_view.mm
diff --git a/chrome/browser/ui/cocoa/tabs/tab_view.mm b/chrome/browser/ui/cocoa/tabs/tab_view.mm
index 85799f4598f4b4ee85473f778c6ae732cde9111b..fabf257148d2c7f44abe47bde4c53e0aaf346e72 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_view.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_view.mm
@@ -257,11 +257,6 @@ const CGFloat kRapidCloseDist = 2.5;
}
}
- // Fire the action to select the tab.
- if ([[controller_ target] respondsToSelector:[controller_ action]])
- [[controller_ target] performSelector:[controller_ action]
- withObject:self];
-
[self resetDragControllers];
// Resolve overlay back to original window.
@@ -547,6 +542,11 @@ const CGFloat kRapidCloseDist = 2.5;
// The drag/click is done. If the user dragged the mouse, finalize the drag
// and clean up.
+ // Fire the action to select the tab.
+ if ([[controller_ target] respondsToSelector:[controller_ action]])
+ [[controller_ target] performSelector:[controller_ action]
+ withObject:self];
+
// Special-case this to keep the logic below simpler.
if (moveWindowOnDrag_)
return;
@@ -747,7 +747,7 @@ const CGFloat kRapidCloseDist = 2.5;
// Mimic the tab strip's bottom border, which consists of a dark border
// and light highlight.
- if (!selected) {
+ if (![controller_ active]) {
[path addClip];
NSRect borderRect = rect;
borderRect.origin.y = 1;

Powered by Google App Engine
This is Rietveld 408576698