Mac: Fix theme image drawing when building with >=10.9 SDK.

chrome/browser/ui/cocoa/tabs/tab_window_controller.mm

Index: chrome/browser/ui/cocoa/tabs/tab_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm
index 103c740d49970350b4a33c23d30aee692021056e..10e779e2be08a43672af91f6613a433451efa030 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm
@@ -8,6 +8,7 @@
 #import "chrome/browser/ui/cocoa/browser_window_layout.h"
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_background_view.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/version_independent_window.h"
@@ -52,7 +53,6 @@
   base::scoped_nsobject<FramedBrowserWindow> window(
       [[FramedBrowserWindow alloc] initWithContentRect:contentRect
                                            hasTabStrip:hasTabStrip]);
-  [self moveContentViewToBack:[window contentView]];
   [window setReleasedWhenClosed:YES];
   [window setAutorecalculatesKeyViewLoop:YES];
 
@@ -65,6 +65,25 @@
                                          NSViewHeightSizable];
     [[[self window] contentView] addSubview:tabContentArea_];
 
+    // tabStripBackgroundView_ draws the theme image behind the tab strip area.
+    // When making a tab dragging window (setUseOverlay:), this view stays in
+    // the parent window so that it can be translucent, while the tab strip view
+    // moves to the child window and stays opaque.
+    NSView* windowView = [window cr_windowView];
+    tabStripBackgroundView_.reset([[TabStripBackgroundView alloc]
+        initWithFrame:NSMakeRect(0,
+                                 NSMaxY([windowView bounds]) -
+                                     kBrowserFrameViewPaintHeight,
+                                 NSWidth([windowView bounds]),
+                                 kBrowserFrameViewPaintHeight)]);
+    [tabStripBackgroundView_
+        setAutoresizingMask:NSViewWidthSizable | NSViewMinYMargin];
+    [windowView addSubview:tabStripBackgroundView_
+                positioned:NSWindowBelow
+                relativeTo:nil];
+
+    [self moveContentViewToBack:[window contentView]];
+
     tabStripView_.reset([[TabStripView alloc]
         initWithFrame:NSMakeRect(0, 0, 750, chrome::kTabStripHeight)]);
     [tabStripView_ setAutoresizingMask:NSViewWidthSizable |
@@ -75,6 +94,10 @@
   return self;
 }
 
+- (NSView*)tabStripBackgroundView {
+  return tabStripBackgroundView_;
+}
+
 - (TabStripView*)tabStripView {
   return tabStripView_;
 }
@@ -289,7 +312,9 @@
   base::scoped_nsobject<NSView> contentView([cv retain]);
   NSView* superview = [contentView superview];
   [contentView removeFromSuperview];
-  [superview addSubview:contentView positioned:NSWindowBelow relativeTo:nil];
+  [superview addSubview:contentView
+             positioned:NSWindowAbove
+             relativeTo:tabStripBackgroundView_];

[erikchen, 2014/09/29 23:23:32]

This doesn't look right.
If tabStripBackgroundView_ is nil, then the contentView is brought to the top
instead.

This logic also relies on the assumption that the contentView and
tabStirpBackgroundView_ are in the same window, which doesn't look true in
browser_window_controller_private.mm:378

[Andre, 2014/09/30 03:57:38]

Good call.
Please see latest patch for the fix.

 }
 
 - (void)insertTabStripView:(NSView*)tabStripView intoWindow:(NSWindow*)window {