[Mac] Placate Clang's (pedantic) warning about CrTrackingArea's initializer.

[Mac] Placate Clang's (pedantic) warning about CrTrackingArea's initializer.

BUG=48709
TEST=Mac Clang compiles

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=74945

[Nico, 2011-02-15 13:57:51]

LG

almost worth filing a bug, but meh

http://codereview.chromium.org/6480067/diff/1/chrome/browser/ui/cocoa/trackin...
File chrome/browser/ui/cocoa/tracking_area.h (right):

http://codereview.chromium.org/6480067/diff/1/chrome/browser/ui/cocoa/trackin...
chrome/browser/ui/cocoa/tracking_area.h:29: // TODO(rsesek): Remove this when
feasabile.
s/when feasible/when switch to 10.6 SDK is done/?

http://codereview.chromium.org/6480067/diff/1/chrome/browser/ui/cocoa/trackin...
File chrome/browser/ui/cocoa/tracking_area.mm (right):

http://codereview.chromium.org/6480067/diff/1/chrome/browser/ui/cocoa/trackin...
chrome/browser/ui/cocoa/tracking_area.mm:76: if ((self = static_cast<id>([super
initWithRect:rect
you could have a TODO to remove this static_cast as well once we're on the 10.6
sdk

[Scott Hess - ex-Googler, 2011-02-15 15:57:20]

LGTM ... assuming the clang trybot failure isn't yours :-).

-scott


On Tue, Feb 15, 2011 at 5:55 AM,  <rsesek@chromium.org> wrote:
> Reviewers: Nico,
>
> Description:
> [Mac] Placate Clang's (pedantic) warning about CrTrackingArea's initializer.
>
> BUG=48709
> TEST=Mac Clang compiles
>
> Please review this at http://codereview.chromium.org/6480067/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files:
>  M chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
>  M chrome/browser/ui/cocoa/tracking_area.h
>  M chrome/browser/ui/cocoa/tracking_area.mm
>  M chrome/browser/ui/cocoa/tracking_area_unittest.mm
>
>
> Index: chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
> diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
> b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
> index
>
eb49281b24190e69fd3681f8502b02f9ceec5a00..4de1db1af3dec7a6c9187d47550866fd0245b1d9
> 100644
> --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
> +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
> @@ -325,7 +325,7 @@ private:
>         [[CrTrackingArea alloc] initWithRect:[newTabButton_ bounds]
>
>  options:(NSTrackingMouseEnteredAndExited |
>                                               NSTrackingActiveAlways)
> -                                       owner:self
> +                                proxiedOwner:self
>                                     userInfo:nil]);
>     if (browserWindow)  // Nil for Browsers without a tab strip (e.g.
> popups).
>       [newTabTrackingArea_ clearOwnerWhenWindowWillClose:browserWindow];
> @@ -359,7 +359,7 @@ private:
>                      NSTrackingMouseMoved |
>                      NSTrackingActiveAlways |
>                      NSTrackingInVisibleRect
> -               owner:self
> +        proxiedOwner:self
>             userInfo:nil]);
>     if (browserWindow)  // Nil for Browsers without a tab strip (e.g.
> popups).
>       [trackingArea_ clearOwnerWhenWindowWillClose:browserWindow];
> Index: chrome/browser/ui/cocoa/tracking_area.h
> diff --git a/chrome/browser/ui/cocoa/tracking_area.h
> b/chrome/browser/ui/cocoa/tracking_area.h
> index
>
26cb2eff778b4412fc1aa9f434f45b948ee5df88..c12c2fd39b2bba9fe0c881c7378a342c9ccf28f7
> 100644
> --- a/chrome/browser/ui/cocoa/tracking_area.h
> +++ b/chrome/browser/ui/cocoa/tracking_area.h
> @@ -20,9 +20,16 @@
>
>  // Designated initializer. Forwards all arguments to the superclass, but
> wraps
>  // |owner| in a proxy object.
> +//
> +// The |proxiedOwner:| paramater has been renamed due to an incompatiblity
> with
> +// the 10.5 SDK. Since that SDK version declares |-[NSTrackingArea's
> init...]|'s
> +// return type to be |NSTrackingArea*| rather than |id|, a more generalized
> type
> +// can't be returned by the subclass. Until the project switches to the
> 10.6 SDK
> +// (where Apple changed the return type to |id|), this ugly hack must
> exist.
> +// TODO(rsesek): Remove this when feasabile.
>  - (id)initWithRect:(NSRect)rect
>            options:(NSTrackingAreaOptions)options
> -             owner:(id)owner
> +      proxiedOwner:(id)owner  // 10.5 SDK hack. Remove at some point.
>           userInfo:(NSDictionary*)userInfo;
>
>  // Prevents any future messages from being delivered to the |owner|.
> 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
>
692515fdbeca4a391dd7f63dd14db7b86fc79641..cd3e9ed7530e6bd86047b90da328f8711168dcfb
> 100644
> --- a/chrome/browser/ui/cocoa/tracking_area.mm
> +++ b/chrome/browser/ui/cocoa/tracking_area.mm
> @@ -69,7 +69,7 @@
>
>  - (id)initWithRect:(NSRect)rect
>            options:(NSTrackingAreaOptions)options
> -             owner:(id)owner
> +      proxiedOwner:(id)owner
>           userInfo:(NSDictionary*)userInfo {
>   scoped_nsobject<CrTrackingAreaOwnerProxy> ownerProxy(
>       [[CrTrackingAreaOwnerProxy alloc] initWithOwner:owner]);
> @@ -82,6 +82,15 @@
>   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 {
>   [[NSNotificationCenter defaultCenter] removeObserver:self];
>   [super dealloc];
> Index: chrome/browser/ui/cocoa/tracking_area_unittest.mm
> diff --git a/chrome/browser/ui/cocoa/tracking_area_unittest.mm
> b/chrome/browser/ui/cocoa/tracking_area_unittest.mm
> index
>
151d03365554f142bf5d69382aab3a8c615898a0..2ff125dc672e2cf516119614c1f870bbeb5e2d8a
> 100644
> --- a/chrome/browser/ui/cocoa/tracking_area_unittest.mm
> +++ b/chrome/browser/ui/cocoa/tracking_area_unittest.mm
> @@ -30,7 +30,7 @@ class CrTrackingAreaTest : public CocoaTest {
>         trackingArea_([[CrTrackingArea alloc]
>             initWithRect:NSMakeRect(0, 0, 100, 100)
>                  options:NSTrackingMouseMoved | NSTrackingActiveInKeyWindow
> -                   owner:owner_.get()
> +            proxiedOwner:owner_.get()
>                 userInfo:nil]) {
>   }
>
>
>
>

[Nico, 2011-02-15 18:44:59]

No, the trybot failed because it needs a clobber due to r74841