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

Unified Diff: chrome/browser/ui/cocoa/tracking_area.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/cocoa/tracking_area.h ('k') | chrome/browser/ui/cocoa/tracking_area_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/tracking_area.mm
diff --git a/chrome/browser/ui/cocoa/tracking_area.mm b/chrome/browser/ui/cocoa/tracking_area.mm
index ac638b853f71536e4106261823218d8639964b2f..004695bc7dedd8b5d5d2ebee6fd75ed146ed6a57 100644
--- a/chrome/browser/ui/cocoa/tracking_area.mm
+++ b/chrome/browser/ui/cocoa/tracking_area.mm
@@ -68,29 +68,20 @@
@implementation CrTrackingArea
- (id)initWithRect:(NSRect)rect
- options:(NSTrackingAreaOptions)options
- proxiedOwner:(id)owner
- userInfo:(NSDictionary*)userInfo {
+ options:(NSTrackingAreaOptions)options
+ owner:(id)owner
+ userInfo:(NSDictionary*)userInfo {
scoped_nsobject<CrTrackingAreaOwnerProxy> ownerProxy(
[[CrTrackingAreaOwnerProxy alloc] initWithOwner:owner]);
- if ((self = static_cast<id>([super initWithRect:rect
- options:options
- owner:ownerProxy.get()
- userInfo:userInfo]))) {
+ if ((self = [super initWithRect:rect
+ options:options
+ owner:ownerProxy.get()
+ userInfo:userInfo])) {
ownerProxy_.swap(ownerProxy);
}
return self;
}
-- (NSTrackingArea*)initWithRect:(NSRect)rect
- options:(NSTrackingAreaOptions)options
- owner:(id)owner
- userInfo:(NSDictionary*)userInfo {
- [NSException raise:@"org.chromium.CrTrackingArea"
- format:@"Cannot init a CrTrackingArea with NSTrackingArea's initializer"];
- return nil;
-}
-
- (void)dealloc {
[self clearOwner];
[[NSNotificationCenter defaultCenter] removeObserver:self];
« no previous file with comments | « chrome/browser/ui/cocoa/tracking_area.h ('k') | chrome/browser/ui/cocoa/tracking_area_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698