mac: Make the avatar button layer backed.

chrome/browser/ui/cocoa/browser_window_controller_private.mm

 // Copyright (c) 2012 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/browser_window_controller_private.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/mac/mac_util.h"
@@ skipping 965 matching lines @@
   if (!barVisibilityUpdatesEnabled_ || [barVisibilityLocks_ count])
     return;
   [presentationModeController_ ensureOverlayHiddenWithAnimation:animation
                                                           delay:delay];
 }
 
 - (CGFloat)toolbarDividerOpacity {
   return [bookmarkBarController_ toolbarDividerOpacity];
 }
 
+- (void)reAddViewToSuperview:(NSView*)view {
+  // Hold a reference to the view so that it doesn't accidentally get
+  // dealloc'ed.
+  base::scoped_nsobject<NSView> reference([view retain]);
+
+  // Get the current position of the view
+  NSView* superview = [view superview];

[Andre, 2014/09/11 03:07:57]

Can we skip this and do an early return if [superview layer] is non-nil?
So that this code automatically gets skipped in the future when the NSThemeFrame
gets a layer, for example when we start linking with >=10.9 SDK.

[erikchen, 2014/09/11 17:29:59]

Sure.

+  NSArray* subviews = [superview subviews];
+  NSInteger index = [subviews indexOfObject:view];
+  NSView* siblingBelow = nil;
+  if (index > 0)
+    siblingBelow = [subviews objectAtIndex:index - 1];
+
+  // Remove the view.
+  [view removeFromSuperview];
+
+  // Add it to the same position.
+  if (siblingBelow) {
+    [superview addSubview:view
+               positioned:NSWindowAbove
+               relativeTo:siblingBelow];
+  } else {
+    [superview addSubview:view
+               positioned:NSWindowBelow
+               relativeTo:nil];
+  }
+}
+
 // TODO(erikchen): The implementation of this method is quite fragile. The
 // method cr_ensureSubview:... does not check that the subview is /directly/
 // above/below the given view. e.g. There are 3 subviews: A, B, C, in that
 // order.  The method cr_ensureSubview:A isPositioned:NSWindowBelow
 // relativeTo:C will have no effect, even though the desired result may have
 // been: B, A, C.  Consider changing it?
 - (void)updateSubviewZOrder:(BOOL)inAnyFullscreen {
   NSView* contentView = [[self window] contentView];
   NSView* toolbarView = [toolbarController_ view];
 
@@ skipping 72 matching lines @@
     // Repeatedly adding/removing the tabstrip from its superview during the
     // AppKit Fullscreen transition causes graphical glitches on 10.10. The
     // correct solution is to use the AppKit fullscreen transition APIs added
     // in 10.7+.
     // http://crbug.com/408791
     if (!hasAdjustedTabStripWhileEnteringAppKitFullscreen_) {
       // Disable implicit animations.
       [CATransaction begin];
       [CATransaction setDisableActions:YES];
 
-      // Get the current position of the tabStripView.
-      NSView* superview = [[self tabStripView] superview];
-      NSArray* subviews = [superview subviews];
-      NSInteger index = [subviews indexOfObject:[self tabStripView]];
-      NSView* siblingBelow = nil;
-      if (index > 0)
-        siblingBelow = [subviews objectAtIndex:index - 1];
-
-      // Remove the tabStripView.
-      [[self tabStripView] removeFromSuperview];
-
-      // Add it to the same position.
-      if (siblingBelow) {
-        [superview addSubview:[self tabStripView]
-                   positioned:NSWindowAbove
-                   relativeTo:siblingBelow];
-      } else {
-        [superview addSubview:[self tabStripView]
-                   positioned:NSWindowBelow
-                   relativeTo:nil];
-      }
+      [self reAddViewToSuperview:[self tabStripView]];
+      [self reAddViewToSuperview:[avatarButtonController_ view]];
 
       [CATransaction commit];
       hasAdjustedTabStripWhileEnteringAppKitFullscreen_ = YES;
     }
   } else {
     hasAdjustedTabStripWhileEnteringAppKitFullscreen_ = NO;
   }
 }
 
 - (void)updateInfoBarTipVisibility {
@@ skipping 29 matching lines @@
 
 - (void)exitAppKitFullscreen {
   DCHECK(base::mac::IsOSLionOrLater());
   if (FramedBrowserWindow* framedBrowserWindow =
           base::mac::ObjCCast<FramedBrowserWindow>([self window])) {
     [framedBrowserWindow toggleSystemFullScreen];
   }
 }
 
 @end  // @implementation BrowserWindowController(Private)