Don't fall back to default incognito colors and tints when using a custom theme.

chrome/browser/themes/theme_service.cc

 // 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.
 
 #include "chrome/browser/themes/theme_service.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 328 matching lines @@
   return profile_->GetPrefs()->GetString(prefs::kCurrentThemeID);
 }
 
 color_utils::HSL ThemeService::GetTint(int id, bool incognito) const {
   DCHECK(CalledOnValidThread());
 
   color_utils::HSL hsl;
   if (theme_supplier_ && theme_supplier_->GetTint(id, &hsl))
     return hsl;
 
-  return ThemeProperties::GetDefaultTint(id, incognito);
+  // Always fall back to the non-incognito tint when there's a custom theme.
+  // See comment in GetDefaultColor().
+  return ThemeProperties::GetDefaultTint(id, incognito && !theme_supplier_);
 }
 
 void ThemeService::ClearAllThemeData() {
   if (!ready_)
     return;
 
   SwapThemeSupplier(nullptr);
 
   // Clear our image cache.
   FreePlatformCaches();
@@ skipping 255 matching lines @@
           GetColor(ThemeProperties::COLOR_TOOLBAR, incognito);
       SkColor text_color = GetColor(ThemeProperties::COLOR_TAB_TEXT, incognito);
       return SkColorSetARGB(
           SkColorGetA(text_color),
           (SkColorGetR(text_color) + SkColorGetR(toolbar_color)) / 2,
           (SkColorGetG(text_color) + SkColorGetR(toolbar_color)) / 2,
           (SkColorGetB(text_color) + SkColorGetR(toolbar_color)) / 2);
     }
   }
 
-  return ThemeProperties::GetDefaultColor(id, incognito);
+  // Always fall back to the non-incognito color when there's a custom theme
+  // because the default (classic) incognito color may be dramatically different
+  // (optimized for a light-on-dark color).
+  return ThemeProperties::GetDefaultColor(id, incognito && !theme_supplier_);
 }
 
 int ThemeService::GetDisplayProperty(int id) const {
   int result = 0;
   if (theme_supplier_ && theme_supplier_->GetDisplayProperty(id, &result)) {
     return result;
   }
 
   switch (id) {
     case ThemeProperties::NTP_BACKGROUND_ALIGNMENT:
@@ skipping 229 matching lines @@
 
 bool ThemeService::BrowserThemeProvider::HasCustomImage(int id) const {
   return theme_service_.HasCustomImage(id);
 }
 
 base::RefCountedMemory* ThemeService::BrowserThemeProvider::GetRawData(
     int id,
     ui::ScaleFactor scale_factor) const {
   return theme_service_.GetRawData(id, scale_factor);
 }