[Material][Mac] Fix tabstrip and avatar button hierarchy

chrome/browser/ui/cocoa/tabs/tab_window_controller.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/tabs/tab_window_controller.h"
 
 #include "base/logging.h"
 #import "base/mac/sdk_forward_declarations.h"
 #import "chrome/browser/ui/cocoa/browser_window_layout.h"
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
@@ skipping 164 matching lines @@
     [[self tabStripView] setInATabDraggingOverlayWindow:YES];
     [[overlayWindow_ contentView] addSubview:originalContentView_];
 
     [overlayWindow_ orderFront:nil];
   } else if (!useOverlay && overlayWindow_) {
     DCHECK(originalContentView_);
 
     // Return the original window's tab strip view and content view to their
     // places. The TabStripView always needs to be in front of the window's
     // content view and therefore it should always be added after the content
-    // view is set. It needs to be positioned at the bottom of the view
-    // hierarchy to ensure that it does not overlap the avatar button icon.
+    // view is set. It needs to be positioned below the avatar button to ensure
+    // that its overlay will not overlap it.
     [[window contentView] addSubview:originalContentView_
                           positioned:NSWindowBelow
                           relativeTo:nil];
     originalContentView_.frame = [[window contentView] bounds];
     [[window contentView] addSubview:[self tabStripView]
                           positioned:NSWindowBelow
-                          relativeTo:nil];
+                          relativeTo:[self avatarView]];
     [[self tabStripView] setInATabDraggingOverlayWindow:NO];
     [[window contentView] updateTrackingAreas];
 
     [focusBeforeOverlay_ restoreFocusInWindow:window];
     focusBeforeOverlay_.reset();
 
     [window display];
     [window removeChildWindow:overlayWindow_];
 
     [overlayWindow_ orderOut:nil];
@@ skipping 104 matching lines @@
   NOTIMPLEMENTED();
   return NO;
 }
 
 - (CGFloat)menubarOffset {
   // Subclasses should implement this.
   NOTIMPLEMENTED();
   return 0;
 }
 
+- (NSView*)avatarView {
+  return nil;
+}
+
 - (NSString*)activeTabTitle {
   // subclass must implement
   NOTIMPLEMENTED();
   return @"";
 }
 
 - (BOOL)hasTabStrip {
   // Subclasses should implement this.
   NOTIMPLEMENTED();
   return YES;
@@ skipping 65 matching lines @@
   [visualEffectView addSubview:tabStripBackgroundView_];
 }
 
 // Called when the size of the window content area has changed. Override to
 // position specific views. Base class implementation does nothing.
 - (void)layoutSubviews {
   NOTIMPLEMENTED();
 }
 
 @end