Fix white flash when opening incognito NTP

chrome/browser/themes/theme_properties.cc

 // Copyright (c) 2013 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.
 
 #include "chrome/browser/themes/theme_properties.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/strings/string_split.h"
@@ skipping 49 matching lines @@
     color_utils::GetSysSkColor(COLOR_WINDOW);
 const SkColor kDefaultColorNTPText =
     color_utils::GetSysSkColor(COLOR_WINDOWTEXT);
 const SkColor kDefaultColorNTPLink = color_utils::GetSysSkColor(COLOR_HOTLIGHT);
 #else
 // TODO(beng): source from theme provider.
 constexpr SkColor kDefaultColorNTPBackground = SK_ColorWHITE;
 constexpr SkColor kDefaultColorNTPText = SK_ColorBLACK;
 const SkColor kDefaultColorNTPLink = SkColorSetRGB(0x06, 0x37, 0x74);
 #endif  // OS_WIN
+const SkColor kDefaultColorNTPBackgroundOtr = SkColorSetRGB(0x30, 0x30, 0x30);

[Evan Stade, 2017/05/19 15:34:54]

nit: the term used for the colors in this file is incognito rather than otr. I
think whatever references to otr do exist are supposed to be changed.

[Marc Treib, 2017/05/19 17:13:42]

I was being consistent with the "bool otr" below ;)

Since I'm OOO now and can't change it right now, I'll land this as-is to get the
fix into M60. I solemnly promise to send a followup to fix the naming once I'm
back in ~two weeks. :)

 
 const SkColor kDefaultColorNTPHeader = SkColorSetRGB(0x96, 0x96, 0x96);
 constexpr SkColor kDefaultColorButtonBackground = SK_ColorTRANSPARENT;
 
 // Default tints.
 constexpr color_utils::HSL kDefaultTintButtons = {-1, -1, -1};
 constexpr color_utils::HSL kDefaultTintButtonsIncognito = {-1, -1, 0.85};
 constexpr color_utils::HSL kDefaultTintFrame = {-1, -1, -1};
 constexpr color_utils::HSL kDefaultTintFrameInactive = {-1, -1, 0.75};
 constexpr color_utils::HSL kDefaultTintFrameIncognito = {-1, 0.2, 0.35};
@@ skipping 148 matching lines @@
                  : kDefaultColorFrameInactive;
     case COLOR_TOOLBAR:
       return otr ? kDefaultColorToolbarIncognito : kDefaultColorToolbar;
     case COLOR_TAB_TEXT:
     case COLOR_BOOKMARK_TEXT:
       return otr ? kDefaultColorToolbarTextIncognito : kDefaultColorToolbarText;
     case COLOR_BACKGROUND_TAB_TEXT:
       return otr ? kDefaultColorBackgroundTabTextIncognito
                  : kDefaultColorBackgroundTabText;
     case COLOR_NTP_BACKGROUND:
-      return kDefaultColorNTPBackground;
+      return otr ? kDefaultColorNTPBackgroundOtr : kDefaultColorNTPBackground;
     case COLOR_NTP_TEXT:
       return kDefaultColorNTPText;
     case COLOR_NTP_LINK:
       return kDefaultColorNTPLink;
     case COLOR_NTP_HEADER:
       return kDefaultColorNTPHeader;
     case COLOR_BUTTON_BACKGROUND:
       return kDefaultColorButtonBackground;
 
     // Properties not stored in theme pack.
@@ skipping 47 matching lines @@
     case COLOR_FRAME_INCOGNITO:
     case COLOR_FRAME_INCOGNITO_INACTIVE:
       NOTREACHED() << "These values should be queried via their respective "
                       "non-incognito equivalents and an appropriate |otr| "
                       "value.";
       return gfx::kPlaceholderColor;
   }
 
   return gfx::kPlaceholderColor;
 }