[Mac] Fix rough-looking profile picker text, especially with a dark theme.

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"
 #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
-                                      titleBar:(BOOL)hasTitleBar;
-
-// Called when NSWindowWillEnterFullScreenNotification notification received.
-// Makes visual effects view hidden as it should not be displayed in fullscreen.
-- (void)windowWillEnterFullScreenNotification:(NSNotification*)notification;
-
-// Called when NSWindowWillExitFullScreenNotification notification received.
-// Makes visual effects view visible since it was hidden in fullscreen.
-- (void)windowWillExitFullScreenNotification:(NSNotification*)notification;
-
+// TODO: Remove once we no longer support 10.9 (-Wunguarded-availability)

[Robert Sesek, 2017/01/13 19:39:42]

Same comment.

[Sidney San Martín, 2017/01/13 20:05:17]

Done.

+@interface NSWindow (TitlebarAppearsTransparent)
+@property BOOL titlebarAppearsTransparent;
 @end
+// /TODO
 
 @interface TabWindowOverlayWindow : NSWindow
 @end
 
 @implementation TabWindowOverlayWindow
 
 - (const ui::ThemeProvider*)themeProvider {
   return [[self parentWindow] themeProvider];
 }
 
@@ skipping 49 matching lines @@
     // 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 contentView];
     CGFloat paintHeight = [FramedBrowserWindow browserFrameViewPaintHeight];
     tabStripBackgroundView_.reset([[TabStripBackgroundView alloc]
         initWithFrame:NSMakeRect(0, NSMaxY([windowView bounds]) - paintHeight,
                                  NSWidth([windowView bounds]), paintHeight)]);
     [tabStripBackgroundView_
         setAutoresizingMask:NSViewWidthSizable | NSViewMinYMargin];
-    [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_];
 
+    if ([window respondsToSelector:@selector(setTitlebarAppearsTransparent:)])
+      [window setTitlebarAppearsTransparent:YES];
+
     if (chrome::ShouldUseFullSizeContentView()) {
-      // |windowWillEnterFullScreen:| and |windowWillExitFullScreen:| are
-      // already called because self is a delegate for the window. However this
-      // class is designed for subclassing and can not implement
-      // NSWindowDelegate methods (because subclasses can do so as well and they
-      // should be able to). TODO(crbug.com/654656): Move |visualEffectView_| to
-      // subclass.
-      [[NSNotificationCenter defaultCenter]
-          addObserver:self
-             selector:@selector(windowWillEnterFullScreenNotification:)
-                 name:NSWindowWillEnterFullScreenNotification
-               object:window];
-      [[NSNotificationCenter defaultCenter]
-          addObserver:self
-             selector:@selector(windowWillExitFullScreenNotification:)
-                 name:NSWindowWillExitFullScreenNotification
-               object:window];
+      [[window contentView] addSubview:tabStripBackgroundView_];

[Robert Sesek, 2017/01/13 19:39:42]

Use the windowView local here and on line 108 instead.

[Sidney San Martín, 2017/01/13 20:05:17]

I renamed it and moved it up to use in more places; let me know how that looks.

+    } else {
+      NSView* rootView = [[self.window contentView] superview];
+      [rootView addSubview:tabStripBackgroundView_
+                positioned:NSWindowBelow
+                relativeTo:nil];
     }
   }
   return self;
 }
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }
 
@@ skipping 59 matching lines @@
     // followed by RenderWidgetHost::Blur(), which would result in an unexpected
     // loss of focus.
     focusBeforeOverlay_.reset([[FocusTracker alloc] initWithWindow:window]);
     [window makeFirstResponder:nil];
 
     // Move the original window's tab strip view and content view to the overlay
     // window. The content view is added as a subview of the overlay window's
     // content view (rather than using setContentView:) because the overlay
     // window has a different content size (due to it being borderless).
     [[overlayWindow_ contentView] addSubview:[self tabStripView]];
-    [[self tabStripView] setInATabDraggingOverlayWindow:YES];
+    [tabStripBackgroundView_ 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 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:[self avatarView]];
-    [[self tabStripView] setInATabDraggingOverlayWindow:NO];
+    [tabStripBackgroundView_ setInATabDraggingOverlayWindow:NO];
     [[window contentView] updateTrackingAreas];
 
     [focusBeforeOverlay_ restoreFocusInWindow:window];
     focusBeforeOverlay_.reset();
 
     [window display];
     [window removeChildWindow:overlayWindow_];
 
     [overlayWindow_ orderOut:nil];
     [overlayWindow_ release];
@@ skipping 132 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
-                                      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 (!nsVisualEffectViewClass) {
-    DCHECK(!chrome::ShouldUseFullSizeContentView());
-    [rootView addSubview:tabStripBackgroundView_
-              positioned:NSWindowBelow
-              relativeTo:nil];
-    return;
-  }
-
-  [window setTitlebarAppearsTransparent:YES];
-
-  // If the window has a normal titlebar, then do not add NSVisualEffectView.
-  if (hasTitleBar)
-    return;
-
-  visualEffectView_.reset(
-      [[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];
-
-  if (chrome::ShouldUseFullSizeContentView()) {
-    [[window contentView] addSubview:visualEffectView_];
-  } else {
-    [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();
 }
 
-- (void)windowWillEnterFullScreenNotification:(NSNotification*)notification {
-  [[visualEffectView_ animator] setAlphaValue:0.0];
-}
-
-- (void)windowWillExitFullScreenNotification:(NSNotification*)notification {
-  [[visualEffectView_ animator] setAlphaValue:1.0];
-}
-
 @end