cocoa browser: remove non-material tabstrip support

chrome/browser/ui/cocoa/tabs/tab_view.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_view.h"
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 64 matching lines @@
 extern NSString* const _Nonnull NSWorkspaceAccessibilityDisplayOptionsDidChangeNotification;
 
 namespace {
 
 enum StrokeType {
   STROKE_NORMAL,
   STROKE_HEAVY,
 };
 
 NSImage* imageForResourceID(int resource_id, StrokeType stroke_type) {
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    return [rb.GetNativeImageNamed(resource_id).CopyNSImage() autorelease];
-  }
-
   CGFloat imageWidth = resource_id == IDR_TAB_ACTIVE_CENTER ? 1 : 18;
   SEL theSelector = 0;
   switch (resource_id) {
     case IDR_TAB_ACTIVE_LEFT:
       theSelector = @selector(drawTabLeftEdgeImage);
       break;
 
     case IDR_TAB_ACTIVE_CENTER:
       theSelector = @selector(drawTabMiddleEdgeImage);
       break;
@@ skipping 29 matching lines @@
 ui::ThreePartImage& GetMaskImage() {
   CR_DEFINE_STATIC_LOCAL(
       ui::ThreePartImage, mask,
       (imageForResourceID(IDR_TAB_ALPHA_LEFT, STROKE_NORMAL), nullptr,
        imageForResourceID(IDR_TAB_ALPHA_RIGHT, STROKE_NORMAL)));
 
   return mask;
 }
 
 ui::ThreePartImage& GetStrokeImage(bool active, StrokeType stroke_type) {
-  if (!ui::MaterialDesignController::IsModeMaterial() && !active) {
-    CR_DEFINE_STATIC_LOCAL(
-        ui::ThreePartImage, inactiveStroke,
-        (imageForResourceID(IDR_TAB_INACTIVE_LEFT, STROKE_NORMAL),
-         imageForResourceID(IDR_TAB_INACTIVE_CENTER, STROKE_NORMAL),

[Avi (use Gerrit), 2016/09/22 19:14:06]

Are these images removed?

[Elly Fong-Jones, 2016/09/23 12:28:16]

Hm - they are no longer needed for mac cocoa browser, but still needed for mac
views browser, so I don't know if we can yank them or not.

-         imageForResourceID(IDR_TAB_INACTIVE_RIGHT, STROKE_NORMAL)));
-    return inactiveStroke;
-  }
   CR_DEFINE_STATIC_LOCAL(
       ui::ThreePartImage, stroke,
       (imageForResourceID(IDR_TAB_ACTIVE_LEFT, STROKE_NORMAL),
        imageForResourceID(IDR_TAB_ACTIVE_CENTER, STROKE_NORMAL),
        imageForResourceID(IDR_TAB_ACTIVE_RIGHT, STROKE_NORMAL)));
   CR_DEFINE_STATIC_LOCAL(
       ui::ThreePartImage, heavyStroke,
       (imageForResourceID(IDR_TAB_ACTIVE_LEFT, STROKE_HEAVY),
        imageForResourceID(IDR_TAB_ACTIVE_CENTER, STROKE_HEAVY),
        imageForResourceID(IDR_TAB_ACTIVE_RIGHT, STROKE_HEAVY)));
@@ skipping 38 matching lines @@
     closeButton_ = closeButton;
 
     // Make a text field for the title, but don't add it as a subview.
     // We will use the cell to draw the text directly into our layer,
     // so that we can get font smoothing enabled.
     titleView_.reset([[NSTextField alloc] init]);
     [titleView_ setAutoresizingMask:NSViewWidthSizable];
     base::scoped_nsobject<GTMFadeTruncatingTextFieldCell> labelCell(
         [[GTMFadeTruncatingTextFieldCell alloc] initTextCell:@"Label"]);
     [labelCell setControlSize:NSSmallControlSize];
-    // Font size is 12, per Material Design spec.
-    CGFloat fontSize = 12;
-    if (!ui::MaterialDesignController::IsModeMaterial()) {
-      fontSize = [NSFont systemFontSizeForControlSize:NSSmallControlSize];
-    }
     [titleView_ setCell:labelCell];
     titleViewCell_ = labelCell;
 
     [self setWantsLayer:YES];  // -drawFill: needs a layer.
 
     if (&NSWorkspaceAccessibilityDisplayOptionsDidChangeNotification) {
       NSNotificationCenter* center =
           [[NSWorkspace sharedWorkspace] notificationCenter];
       [center
           addObserver:self
@@ skipping 201 matching lines @@
 - (void)drawFill:(NSRect)dirtyRect {
   gfx::ScopedNSGraphicsContextSaveGState scopedGState;
   NSRect bounds = [self bounds];
 
   NSRect clippingRect = bounds;
   clippingRect.size.height = [TabView maskImageFillHeight];
   if (state_ != NSOnState) {
     // Background tabs should not paint over the tab strip separator, which is
     // two pixels high in both lodpi and hidpi, and one pixel high in MD.
     CGFloat tabStripSeparatorLineWidth = [self cr_lineWidth];
-    if (!ui::MaterialDesignController::IsModeMaterial()) {
-      tabStripSeparatorLineWidth *= 2;
-    }
     clippingRect.origin.y = tabStripSeparatorLineWidth;
     clippingRect.size.height -= tabStripSeparatorLineWidth;
   }
   NSRectClip(clippingRect);
 
   NSPoint position = [[self window]
       themeImagePositionForAlignment:THEME_IMAGE_ALIGN_WITH_TAB_STRIP];
   [[NSGraphicsContext currentContext] cr_setPatternPhase:position forView:self];
 
   [[self backgroundColorForSelected:(state_ != NSOffState)] set];
@@ skipping 35 matching lines @@
     // theme machinery will make one if given a frame image. See
     // BrowserThemePack::GenerateTabBackgroundImages for details.
     const ui::ThemeProvider* themeProvider = [[self window] themeProvider];
     BOOL hasCustomTheme = themeProvider &&
         (themeProvider->HasCustomImage(IDR_THEME_TAB_BACKGROUND) ||
          themeProvider->HasCustomImage(IDR_THEME_FRAME));
     // Draw a mouse hover gradient for the default themes.
     if (hoverAlpha > 0) {
       if (themeProvider && !hasCustomTheme) {
         CGFloat whiteValue = 1;
-        // In MD Incognito mode, give the glow a darker value.
-        if (ui::MaterialDesignController::IsModeMaterial() && themeProvider
-            && themeProvider->InIncognitoMode()) {
+        // In Incognito mode, give the glow a darker value.
+        if (themeProvider && themeProvider->InIncognitoMode()) {
           whiteValue = 0.5;
         }
         base::scoped_nsobject<NSGradient> glow([NSGradient alloc]);
         [glow initWithStartingColor:[NSColor colorWithCalibratedWhite:whiteValue
                                         alpha:1.0 * hoverAlpha]
                         endingColor:[NSColor colorWithCalibratedWhite:whiteValue
                                                                 alpha:0.0]];
         NSRect rect = [self bounds];
         NSPoint point = hoverPoint_;
         point.y = NSHeight(rect);
         [glow drawFromCenter:point
                       radius:0.0
                     toCenter:point
                       radius:NSWidth(rect) / 3.0
                      options:NSGradientDrawsBeforeStartingLocation];
       }
     }
 
     CGContextEndTransparencyLayer(cgContext);
   }
 }
 
 // Draws the tab outline.
 - (void)drawStroke:(NSRect)dirtyRect {
-  CGFloat alpha = [[self window] isMainWindow] ? 1.0 : tabs::kImageNoFocusAlpha;
+  // In MD, the tab stroke is always opaque.
+  CGFloat alpha = 1;
   NSRect bounds = [self bounds];
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    // In Material Design the tab strip separator is always 1 pixel high -
-    // add a clip rect to avoid drawing the tab edge over it.
-    NSRect clipRect = bounds;
-    clipRect.origin.y += [self cr_lineWidth];
-    NSRectClip(clipRect);
-    // In MD, the tab stroke is always opaque.
-    alpha = 1;
-  }
+  // In Material Design the tab strip separator is always 1 pixel high -
+  // add a clip rect to avoid drawing the tab edge over it.
+  NSRect clipRect = bounds;
+  clipRect.origin.y += [self cr_lineWidth];
+  NSRectClip(clipRect);
   const ui::ThemeProvider* provider = [[self window] themeProvider];
   GetStrokeImage(state_ == NSOnState,
                  provider && provider->ShouldIncreaseContrast()
                      ? STROKE_HEAVY
                      : STROKE_NORMAL)
       .DrawInRect(bounds, NSCompositeSourceOver, alpha);
 }
 
 - (void)drawRect:(NSRect)dirtyRect {
   [self drawFill:dirtyRect];
@@ skipping 490 matching lines @@
 
 // For "Increase Contrast" mode, use flat black instead of semitransparent black
 // for the tab edge stroke.
 + (void)setTabEdgeStrokeColor {
   static NSColor* heavyStrokeColor =
       [skia::SkColorToSRGBNSColor(SK_ColorBLACK) retain];
   [heavyStrokeColor set];
 }
 
 @end