mac: Set background color from theme before NSView is added to window

chrome/browser/ui/cocoa/tab_contents/tab_contents_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/tab_contents/tab_contents_controller.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #import "chrome/browser/themes/theme_properties.h"
 #import "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #include "chrome/browser/ui/view_ids.h"
+#include "chrome/grit/theme_resources.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/cocoa/animation_utils.h"
 #include "ui/gfx/geometry/rect.h"
 
 using content::WebContents;
@@ skipping 54 matching lines @@
 @end
 
 // An NSView with special-case handling for when the contents view does not
 // expand to fill the entire tab contents area. See 'AutoEmbedFullscreen mode'
 // in header file comments.
 @interface TabContentsContainerView : NSView {
  @private
   TabContentsController* delegate_;  // weak
 }
 
-- (void)updateBackgroundColor;
+- (void)updateBackgroundColorFromWindowTheme:(NSWindow*)window;
 @end
 
 @implementation TabContentsContainerView
 
 - (id)initWithDelegate:(TabContentsController*)delegate {
   if ((self = [super initWithFrame:NSZeroRect])) {
     delegate_ = delegate;
     ScopedCAActionDisabler disabler;
     base::scoped_nsobject<CALayer> layer([[CALayer alloc] init]);
     [self setLayer:layer];
     [self setWantsLayer:YES];
-    [self updateBackgroundColor];
   }
   return self;
 }
 
 // Called by the delegate during dealloc to invalidate the pointer held by this
 // view.
 - (void)delegateDestroyed {
   delegate_ = nil;
 }
 
@@ skipping 12 matching lines @@
     return;
   }
 
   ScopedCAActionDisabler disabler;
   [contentsView setFrame:[delegate_ frameForContentsViewIn:self]];
 }
 
 // Update the background layer's color whenever the view needs to repaint.
 - (void)setNeedsDisplayInRect:(NSRect)rect {
   [super setNeedsDisplayInRect:rect];
-  [self updateBackgroundColor];
+  [self updateBackgroundColorFromWindowTheme:[self window]];
 }
 
-- (void)updateBackgroundColor {
+- (void)updateBackgroundColorFromWindowTheme:(NSWindow*)window {
   // This view is sometimes flashed into visibility (e.g, when closing
   // windows or opening new tabs), so ensure that the flash be the theme
   // background color in those cases.
-  SkColor skBackgroundColor = SK_ColorWHITE;
-  const ThemeProvider* theme = [[self window] themeProvider];
-  if (theme)
-    skBackgroundColor = theme->GetColor(ThemeProperties::COLOR_NTP_BACKGROUND);
+  const ThemeProvider* theme = [window themeProvider];
+  ThemedWindowStyle windowStyle = [window themedWindowStyle];
+  if (!theme)
+    return;
+
+  // This logic and hard-coded color value are duplicated from the function
+  // NTPResourceCache::CreateNewTabIncognitoCSS. This logic should exist in only
+  // one location.
+  // https://crbug.com/719236
+  SkColor skBackgroundColor =
+      theme->GetColor(ThemeProperties::COLOR_NTP_BACKGROUND);
+  bool incognito = windowStyle & THEMED_INCOGNITO;
+  if (incognito && !theme->HasCustomImage(IDR_THEME_NTP_BACKGROUND))
+    skBackgroundColor = SkColorSetRGB(0x32, 0x32, 0x32);
 
   // If the page is in fullscreen tab capture mode, change the background color
   // to be a dark tint of the new tab page's background color.
   if ([delegate_ contentsInFullscreenCaptureMode]) {
     const int kBackgroundDivisor = 5;
     skBackgroundColor = skBackgroundColor = SkColorSetARGB(
         SkColorGetA(skBackgroundColor),
         SkColorGetR(skBackgroundColor) / kBackgroundDivisor,
         SkColorGetG(skBackgroundColor) / kBackgroundDivisor,
         SkColorGetB(skBackgroundColor) / kBackgroundDivisor);
   }
 
   ScopedCAActionDisabler disabler;
   base::ScopedCFTypeRef<CGColorRef> cgBackgroundColor(
       skia::CGColorCreateFromSkColor(skBackgroundColor));
   [[self layer] setBackgroundColor:cgBackgroundColor];
 }
 
+- (void)viewWillMoveToWindow:(NSWindow*)newWindow {
+  [self updateBackgroundColorFromWindowTheme:newWindow];
+}
+
 - (ViewID)viewID {
   return VIEW_ID_TAB_CONTAINER;
 }
 
 - (BOOL)acceptsFirstResponder {
   return [[self subviews] count] > 0 &&
       [[[self subviews] objectAtIndex:0] acceptsFirstResponder];
 }
 
 // When receiving a click-to-focus in the solid color area surrounding the
@@ skipping 201 matching lines @@
 
 - (BOOL)shouldResizeContentView {
   return !isEmbeddingFullscreenWidget_ || !blockFullscreenResize_;
 }
 
 - (BOOL)isPopup {
   return isPopup_;
 }
 
 @end