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

Side by Side Diff: chrome/browser/cocoa/tab_strip_view.mm

Issue 501135: Revert 34998, more stabbing in the dark to find a perf regression - Mac: impl... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/cocoa/tab_strip_view.h ('k') | chrome/browser/cocoa/toolbar_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/tab_strip_view.h" 5 #import "chrome/browser/cocoa/tab_strip_view.h"
6 6
7 #import "chrome/browser/cocoa/browser_window_controller.h"
8 #import "chrome/browser/cocoa/tab_strip_controller.h"
9 #include "base/logging.h" 7 #include "base/logging.h"
10 8
11 @implementation TabStripView 9 @implementation TabStripView
12 10
13 @synthesize newTabButton = newTabButton_; 11 @synthesize newTabButton = newTabButton_;
14 @synthesize dropArrowShown = dropArrowShown_; 12 @synthesize dropArrowShown = dropArrowShown_;
15 @synthesize dropArrowPosition = dropArrowPosition_; 13 @synthesize dropArrowPosition = dropArrowPosition_;
16 14
17 - (id)initWithFrame:(NSRect)frame { 15 - (id)initWithFrame:(NSRect)frame {
18 self = [super initWithFrame:frame]; 16 self = [super initWithFrame:frame];
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 performSelector:@selector(_shouldMiniaturizeOnDoubleClick)]) 129 performSelector:@selector(_shouldMiniaturizeOnDoubleClick)])
132 [[self window] performMiniaturize:self]; 130 [[self window] performMiniaturize:self];
133 } else { 131 } else {
134 [super mouseUp:event]; 132 [super mouseUp:event];
135 } 133 }
136 134
137 // If clickCount is 0, the drag threshold was passed. 135 // If clickCount is 0, the drag threshold was passed.
138 lastMouseUp_ = (clickCount == 1) ? timestamp : -1000.0; 136 lastMouseUp_ = (clickCount == 1) ? timestamp : -1000.0;
139 } 137 }
140 138
141 // (URLDropTarget protocol) 139 // Required by |URLDropTargetHandler|.
142 - (id<URLDropTargetController>)urlDropController {
143 BrowserWindowController* windowController = [[self window] windowController];
144 DCHECK([windowController isKindOfClass:[BrowserWindowController class]]);
145 return [windowController tabStripController];
146 }
147
148 // (URLDropTarget protocol)
149 - (NSDragOperation)draggingEntered:(id<NSDraggingInfo>)sender { 140 - (NSDragOperation)draggingEntered:(id<NSDraggingInfo>)sender {
150 return [dropHandler_ draggingEntered:sender]; 141 return [dropHandler_ draggingEntered:sender];
151 } 142 }
152 143
153 // (URLDropTarget protocol) 144 // Required by |URLDropTargetHandler|.
154 - (NSDragOperation)draggingUpdated:(id<NSDraggingInfo>)sender { 145 - (NSDragOperation)draggingUpdated:(id<NSDraggingInfo>)sender {
155 return [dropHandler_ draggingUpdated:sender]; 146 return [dropHandler_ draggingUpdated:sender];
156 } 147 }
157 148
158 // (URLDropTarget protocol) 149 // Required by |URLDropTargetHandler|.
159 - (void)draggingExited:(id<NSDraggingInfo>)sender { 150 - (void)draggingExited:(id<NSDraggingInfo>)sender {
160 return [dropHandler_ draggingExited:sender]; 151 return [dropHandler_ draggingExited:sender];
161 } 152 }
162 153
163 // (URLDropTarget protocol) 154 // Required by |URLDropTargetHandler|.
164 - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender { 155 - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender {
165 return [dropHandler_ performDragOperation:sender]; 156 return [dropHandler_ performDragOperation:sender];
166 } 157 }
167 158
168 @end 159 @end
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/tab_strip_view.h ('k') | chrome/browser/cocoa/toolbar_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698