mac: [Yosemite] Fix bug where zoom button causes fullscreen mode.

chrome/browser/ui/cocoa/version_independent_window.mm

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/version_independent_window.h"
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 
+// This view always takes the size of its superview. It is intended to be used
+// as a NSWindow's contentView.  It is needed because NSWindow's implementation
+// explicitly resizes the contentView at inopportune times.
+@interface FullSizeContentView : NSView
+@end
+
+namespace {
+
+// Moves subclasses of FullSizeContentView to the back. Maintains the
+// ordering of the other subviews.
+// |context| should be an NSArray containing the subviews as they were
+// previously ordered.
+// The logic of this function does not work if there is more than 1 subclass of
+// FullSizeContentView in the subviews being reordered.
+int ReorderContentViewToBack(id firstView, id secondView, void* context) {
+  NSArray* subviews = static_cast<NSArray*>(context);
+  if ([firstView isKindOfClass:[FullSizeContentView class]])

[Andre, 2014/07/17 17:56:16]

How about (firstView == [[firstView window] contentView])?
I think it reads better, and RTTI should be avoided when possible.
You can also then delete the above comment about "more than 1 subclass ..."

[erikchen, 2014/07/17 18:22:45]

Seems reasonable to me. Done.

+    return NSOrderedAscending;
+  if ([secondView isKindOfClass:[FullSizeContentView class]])
+    return NSOrderedDescending;
+  NSUInteger index1 = [subviews indexOfObject:firstView];
+  NSUInteger index2 = [subviews indexOfObject:secondView];
+  if (index1 < index2)
+    return NSOrderedAscending;
+  return NSOrderedDescending;

[Andre, 2014/07/17 17:56:16]

Suggestion: return (index1 < index2) ? NSOrderedAscending : NSOrderedDescending.

[erikchen, 2014/07/17 18:22:44]

I see that you are a fan of the ternary operator. Done.

+}
+
+}  // namespace
+
 @interface VersionIndependentWindow ()
 
 + (BOOL)shouldUseFullSizeContentViewForStyle:(NSUInteger)windowStyle;
 
 - (NSView*)chromeWindowView;
 
 @end
 
-// This view always takes the size of its superview. It is intended to be used
-// as a NSWindow's contentView.  It is needed because NSWindow's implementation
-// explicitly resizes the contentView at inopportune times.
-@interface FullSizeContentView : NSView
-@end
-
 @implementation FullSizeContentView
 
 // This method is directly called by NSWindow during a window resize on OSX
 // 10.10.0, beta 2. We must override it to prevent the content view from
 // shrinking.
 - (void)setFrameSize:(NSSize)size {
   if ([self superview])
     size = [[self superview] bounds].size;
   [super setFrameSize:size];
 }
@@ skipping 40 matching lines @@
                             backing:bufferingType
                               defer:deferCreation];
   if (self) {
     if ([VersionIndependentWindow
         shouldUseFullSizeContentViewForStyle:windowStyle]) {
       chromeWindowView_.reset([[FullSizeContentView alloc] init]);
       [chromeWindowView_
           setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
       [chromeWindowView_ setFrame:[[[self contentView] superview] bounds]];
       [self setContentView:chromeWindowView_];
+
+      // Move the content view to the back.
+      // In Yosemite, the content view takes up the full size of the window,
+      // and when it is in front of the zoom/fullscreen button, alt-clicking
+      // the button has the wrong effect.
+      // Adding subviews to the NSThemeFrame provokes a warning in Yosemite, so
+      // we sort the subviews in place.
+      // http://crbug.com/393808
+
+      NSView* superview = [[self contentView] superview];
+      NSArray* subviews = [[[superview subviews] copy] autorelease];

[Andre, 2014/07/17 17:56:16]

Use scoped_nsobject?

[erikchen, 2014/07/17 18:22:44]

Done.

+      [superview sortSubviewsUsingFunction:&ReorderContentViewToBack
+                                   context:subviews];
     }
   }
   return self;
 }
 
 #pragma mark - Private Methods
 
 + (BOOL)shouldUseFullSizeContentViewForStyle:(NSUInteger)windowStyle {
   return (windowStyle & NSTitledWindowMask) && base::mac::IsOSYosemiteOrLater();
 }
@@ skipping 46 matching lines @@
   return [super contentRectForFrameRect:fRect styleMask:aStyle];
 }
 
 - (NSRect)contentRectForFrameRect:(NSRect)frameRect {
   if (chromeWindowView_)
     return frameRect;
   return [super contentRectForFrameRect:frameRect];
 }
 
 @end