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

Side by Side Diff: chrome/browser/ui/cocoa/tracking_area.h

Issue 6480067: [Mac] Placate Clang's (pedantic) warning about CrTrackingArea's initializer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef CHROME_BROWSER_UI_COCOA_TRACKING_AREA_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_TRACKING_AREA_H_
6 #define CHROME_BROWSER_UI_COCOA_TRACKING_AREA_H_ 6 #define CHROME_BROWSER_UI_COCOA_TRACKING_AREA_H_
7 7
8 #import <AppKit/AppKit.h> 8 #import <AppKit/AppKit.h>
9 9
10 #include "base/scoped_nsobject.h" 10 #include "base/scoped_nsobject.h"
11 11
12 @class CrTrackingAreaOwnerProxy; 12 @class CrTrackingAreaOwnerProxy;
13 13
14 // The CrTrackingArea can be used in place of an NSTrackingArea to shut off 14 // The CrTrackingArea can be used in place of an NSTrackingArea to shut off
15 // messaging to the |owner| at a specific point in time. 15 // messaging to the |owner| at a specific point in time.
16 @interface CrTrackingArea : NSTrackingArea { 16 @interface CrTrackingArea : NSTrackingArea {
17 @private 17 @private
18 scoped_nsobject<CrTrackingAreaOwnerProxy> ownerProxy_; 18 scoped_nsobject<CrTrackingAreaOwnerProxy> ownerProxy_;
19 } 19 }
20 20
21 // Designated initializer. Forwards all arguments to the superclass, but wraps 21 // Designated initializer. Forwards all arguments to the superclass, but wraps
22 // |owner| in a proxy object. 22 // |owner| in a proxy object.
23 //
24 // The |proxiedOwner:| paramater has been renamed due to an incompatiblity with
25 // the 10.5 SDK. Since that SDK version declares |-[NSTrackingArea's init...]|'s
26 // return type to be |NSTrackingArea*| rather than |id|, a more generalized type
27 // can't be returned by the subclass. Until the project switches to the 10.6 SDK
28 // (where Apple changed the return type to |id|), this ugly hack must exist.
29 // TODO(rsesek): Remove this when feasabile.
Nico 2011/02/15 13:57:51 s/when feasible/when switch to 10.6 SDK is done/?
23 - (id)initWithRect:(NSRect)rect 30 - (id)initWithRect:(NSRect)rect
24 options:(NSTrackingAreaOptions)options 31 options:(NSTrackingAreaOptions)options
25 owner:(id)owner 32 proxiedOwner:(id)owner // 10.5 SDK hack. Remove at some point.
26 userInfo:(NSDictionary*)userInfo; 33 userInfo:(NSDictionary*)userInfo;
27 34
28 // Prevents any future messages from being delivered to the |owner|. 35 // Prevents any future messages from being delivered to the |owner|.
29 - (void)clearOwner; 36 - (void)clearOwner;
30 37
31 // Watches |window| for its NSWindowWillCloseNotification and calls 38 // Watches |window| for its NSWindowWillCloseNotification and calls
32 // |-clearOwner| when the notification is observed. 39 // |-clearOwner| when the notification is observed.
33 - (void)clearOwnerWhenWindowWillClose:(NSWindow*)window; 40 - (void)clearOwnerWhenWindowWillClose:(NSWindow*)window;
34 41
35 @end 42 @end
36 43
37 #endif // CHROME_BROWSER_UI_COCOA_TRACKING_AREA_H_ 44 #endif // CHROME_BROWSER_UI_COCOA_TRACKING_AREA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698