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

Side by Side Diff: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

Issue 10807052: mac: Remove code that was only needed on 10.5 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: kill workspaceIDCache_ Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/cocoa/toolbar/toolbar_controller.h" 5 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/mac/bundle_locations.h" 9 #include "base/mac/bundle_locations.h"
10 #include "base/mac/mac_util.h" 10 #include "base/mac/mac_util.h"
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 // (http://crbug.com/18551). We avoid the problem by incrementing 298 // (http://crbug.com/18551). We avoid the problem by incrementing
299 // the retain count of the location bar; use of the scoped object 299 // the retain count of the location bar; use of the scoped object
300 // helps us remember to release it. 300 // helps us remember to release it.
301 locationBarRetainer_.reset([locationBar_ retain]); 301 locationBarRetainer_.reset([locationBar_ retain]);
302 trackingArea_.reset( 302 trackingArea_.reset(
303 [[CrTrackingArea alloc] initWithRect:NSZeroRect // Ignored 303 [[CrTrackingArea alloc] initWithRect:NSZeroRect // Ignored
304 options:NSTrackingMouseMoved | 304 options:NSTrackingMouseMoved |
305 NSTrackingInVisibleRect | 305 NSTrackingInVisibleRect |
306 NSTrackingMouseEnteredAndExited | 306 NSTrackingMouseEnteredAndExited |
307 NSTrackingActiveAlways 307 NSTrackingActiveAlways
308 proxiedOwner:self 308 owner:self
309 userInfo:nil]); 309 userInfo:nil]);
310 NSView* toolbarView = [self view]; 310 NSView* toolbarView = [self view];
311 [toolbarView addTrackingArea:trackingArea_.get()]; 311 [toolbarView addTrackingArea:trackingArea_.get()];
312 312
313 // If the user has any Browser Actions installed, the container view for them 313 // If the user has any Browser Actions installed, the container view for them
314 // may have to be resized depending on the width of the toolbar frame. 314 // may have to be resized depending on the width of the toolbar frame.
315 [toolbarView setPostsFrameChangedNotifications:YES]; 315 [toolbarView setPostsFrameChangedNotifications:YES];
316 [[NSNotificationCenter defaultCenter] 316 [[NSNotificationCenter defaultCenter]
317 addObserver:self 317 addObserver:self
318 selector:@selector(toolbarFrameChanged) 318 selector:@selector(toolbarFrameChanged)
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 - (void)hideDropURLsIndicatorInView:(NSView*)view { 796 - (void)hideDropURLsIndicatorInView:(NSView*)view {
797 // Do nothing. 797 // Do nothing.
798 } 798 }
799 799
800 // (URLDropTargetController protocol) 800 // (URLDropTargetController protocol)
801 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info { 801 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
802 return drag_util::IsUnsupportedDropData(profile_, info); 802 return drag_util::IsUnsupportedDropData(profile_, info);
803 } 803 }
804 804
805 @end 805 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm ('k') | chrome/browser/ui/cocoa/tracking_area.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698