[Material][Mac] Remove NSVisualEffectView from windows with titlebars

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"
 #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"
 #include "grit/theme_resources.h"
 #import "ui/base/cocoa/focus_tracker.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/theme_provider.h"
 
 @interface TabWindowController ()
 - (void)setUseOverlay:(BOOL)useOverlay;
 
 // The tab strip background view should always be inserted as the back-most
 // subview of the root view. It cannot be a subview of the contentView, as that
 // would cause it to become layer backed, which would cause it to draw on top
 // of non-layer backed content like the window controls.
-- (void)insertTabStripBackgroundViewIntoWindow:(NSWindow*)window;
+- (void)insertTabStripBackgroundViewIntoWindow:(NSWindow*)window
+                                      titleBar:(BOOL)hasTitleBar;
 @end
 
 @interface TabWindowOverlayWindow : NSWindow
 @end
 
 @implementation TabWindowOverlayWindow
 
 - (const ui::ThemeProvider*)themeProvider {
   return [[self parentWindow] themeProvider];
 }
 
 - (ThemedWindowStyle)themedWindowStyle {
   return [[self parentWindow] themedWindowStyle];
 }
 
 - (NSPoint)themeImagePositionForAlignment:(ThemeImageAlignment)alignment {
   return [[self parentWindow] themeImagePositionForAlignment:alignment];
 }
 
 @end
 
 @implementation TabWindowController
 
-- (id)initTabWindowControllerWithTabStrip:(BOOL)hasTabStrip {
+- (id)initTabWindowControllerWithTabStrip:(BOOL)hasTabStrip
+                                 titleBar:(BOOL)hasTitleBar {
   const CGFloat kDefaultWidth = 750;
   const CGFloat kDefaultHeight = 600;
 
   NSRect contentRect = NSMakeRect(60, 229, kDefaultWidth, kDefaultHeight);
   base::scoped_nsobject<FramedBrowserWindow> window(
       [[FramedBrowserWindow alloc] initWithContentRect:contentRect
                                            hasTabStrip:hasTabStrip]);
   [window setReleasedWhenClosed:YES];
   [window setAutorecalculatesKeyViewLoop:YES];
 
@@ skipping 19 matching lines @@
     // moves to the child window and stays opaque.
     NSView* windowView = [window contentView];
     tabStripBackgroundView_.reset([[TabStripBackgroundView alloc]
         initWithFrame:NSMakeRect(0,
                                  NSMaxY([windowView bounds]) -
                                      kBrowserFrameViewPaintHeight,
                                  NSWidth([windowView bounds]),
                                  kBrowserFrameViewPaintHeight)]);
     [tabStripBackgroundView_
         setAutoresizingMask:NSViewWidthSizable | NSViewMinYMargin];
-    [self insertTabStripBackgroundViewIntoWindow:window];
+    [self insertTabStripBackgroundViewIntoWindow:window titleBar:hasTitleBar];
 
     tabStripView_.reset([[TabStripView alloc]
         initWithFrame:NSMakeRect(
                           0, 0, kDefaultWidth, chrome::kTabStripHeight)]);
     [tabStripView_ setAutoresizingMask:NSViewWidthSizable |
                                        NSViewMinYMargin];
     if (hasTabStrip)
       [windowView addSubview:tabStripView_];
   }
   return self;
@@ skipping 226 matching lines @@
   return YES;
 }
 
 // Tell the window that it needs to call performClose: as soon as the current
 // drag is complete. This prevents a window (and its overlay) from going away
 // during a drag.
 - (void)deferPerformClose {
   closeDeferred_ = YES;
 }
 
-- (void)insertTabStripBackgroundViewIntoWindow:(NSWindow*)window {
+- (void)insertTabStripBackgroundViewIntoWindow:(NSWindow*)window
+                                      titleBar:(BOOL)hasTitleBar {
   DCHECK(tabStripBackgroundView_);
   NSView* rootView = [[window contentView] superview];
 
   // In Material Design on 10.10 and higher, the top portion of the window is
   // blurred using an NSVisualEffectView.
   Class nsVisualEffectViewClass = NSClassFromString(@"NSVisualEffectView");
   if (!ui::MaterialDesignController::IsModeMaterial() ||
       !nsVisualEffectViewClass) {
     [rootView addSubview:tabStripBackgroundView_
               positioned:NSWindowBelow
               relativeTo:nil];
     return;
   }
 
+  [window setTitlebarAppearsTransparent:YES];

[shrike, 2016/05/13 18:30:21]

What happens in the title-bar case if you don't do this?

+
+  // If the window has a normal titlebar, then do not add NSVisualEffectView.
+  if (hasTitleBar)
+    return;
+
   base::scoped_nsobject<NSVisualEffectView> visualEffectView(
       [[nsVisualEffectViewClass alloc]
           initWithFrame:[tabStripBackgroundView_ frame]]);
   DCHECK(visualEffectView);
 
   [visualEffectView setAutoresizingMask:
       [tabStripBackgroundView_ autoresizingMask]];
   [tabStripBackgroundView_
       setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
 
   // Set to a default appearance and material. If this is an Incognito window
   // the material and vibrancy should be dark but this method gets called at
   // the start of -[BrowserWindowController initWithBrowser:takeOwnership:],
   // before the |browser_| ivar has been set. Without a browser object we
   // can't check the window's theme. The final setup happens in
   // -[TabStripView setController:], at which point we have access to the theme.
   [visualEffectView setAppearance:
       [NSAppearance appearanceNamed:NSAppearanceNameVibrantLight]];
   [visualEffectView setMaterial:NSVisualEffectMaterialLight];
   [visualEffectView setBlendingMode:NSVisualEffectBlendingModeBehindWindow];
   [visualEffectView setState:NSVisualEffectStateFollowsWindowActiveState];
 
-  [window setTitlebarAppearsTransparent:YES];
-
   [rootView addSubview:visualEffectView
             positioned:NSWindowBelow
             relativeTo:nil];
 
   // Make the |tabStripBackgroundView_| a child of the NSVisualEffectView.
   [tabStripBackgroundView_ setFrame:[visualEffectView bounds]];
   [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