Mac: Make it easier for views to correctly draw with a theme.

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 296 matching lines @@
     },
     // Currently focused window.
     {
       IDR_THEME_TAB_BACKGROUND,  // Background tab.
       IDR_THEME_TOOLBAR,         // Active tab.
     },
   };
 
   // Themes don't have an inactive image so only look for one if there's no
   // theme.
-  bool active = [[self window] isKeyWindow] || [[self window] isMainWindow] ||
-                !themeProvider->UsingDefaultTheme();
+  bool active =
+      [[self window] isMainWindow] || !themeProvider->UsingDefaultTheme();
   return themeProvider->GetNSImageColorNamed(bitmapResources[active][selected]);
 }
 
 // Draws the active tab background.
 - (void)drawFillForActiveTab:(NSRect)dirtyRect {
   NSColor* backgroundImageColor = [self backgroundColorForSelected:YES];
   [backgroundImageColor set];
 
   // Themes can have partially transparent images. NSRectFill() is measurably
   // faster though, so call it for the known-safe default theme.
@@ skipping 93 matching lines @@
                      options:NSGradientDrawsBeforeStartingLocation];
       }
     }
 
     CGContextEndTransparencyLayer(cgContext);
   }
 }
 
 // Draws the tab outline.
 - (void)drawStroke:(NSRect)dirtyRect {
-  BOOL focused = [[self window] isKeyWindow] || [[self window] isMainWindow];
+  BOOL focused = [[self window] isMainWindow];
   CGFloat alpha = focused ? 1.0 : tabs::kImageNoFocusAlpha;
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   float height =
       [rb.GetNativeImageNamed(IDR_TAB_ACTIVE_LEFT).ToNSImage() size].height;
   if (state_ == NSOnState) {
     NSDrawThreePartImage(NSMakeRect(0, 0, NSWidth([self bounds]), height),
         rb.GetNativeImageNamed(IDR_TAB_ACTIVE_LEFT).ToNSImage(),
         rb.GetNativeImageNamed(IDR_TAB_ACTIVE_CENTER).ToNSImage(),
         rb.GetNativeImageNamed(IDR_TAB_ACTIVE_RIGHT).ToNSImage(),
@@ skipping 191 matching lines @@
   if ([attribute isEqual:NSAccessibilityEnabledAttribute])
     return [NSNumber numberWithBool:YES];
 
   return [super accessibilityAttributeValue:attribute];
 }
 
 - (ViewID)viewID {
   return VIEW_ID_TAB;
 }
 
+// ThemedWindowDrawing implementation.
+
+- (void)windowDidChangeTheme {
+  [self setNeedsDisplay:YES];
+}
+
+- (void)windowDidChangeActive {
+  [self setNeedsDisplay:YES];
+}
+
 @end  // @implementation TabView
 
 @implementation TabView (TabControllerInterface)
 
 - (void)setController:(TabController*)controller {
   controller_ = controller;
 }
 
 @end  // @implementation TabView (TabControllerInterface)
 
@@ skipping 133 matching lines @@
   CGFloat middleWidth = tabWidth - leftWidth - rightWidth;
   NSRect middleRect = NSMakeRect(leftWidth, 0, middleWidth, kFillHeight);
   [[NSColor whiteColor] setFill];
   NSRectFill(middleRect);
 
   maskCache_.reset(CGBitmapContextCreateImage(maskContext));
   return maskCache_;
 }
 
 @end  // @implementation TabView(Private)