Rejigger ThemeService: move exposure of ThemeProvider interface to a

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 "base/memory/scoped_ptr.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/themes/browser_theme_pack.h"
@@ skipping 27 matching lines @@
 const SkColor kDefaultColorFrameIncognito[] = {
     SkColorSetRGB(83, 106, 139), SkColorSetRGB(160, 160, 162)};
 const SkColor kDefaultColorFrameIncognitoInactive[] = {
     SkColorSetRGB(126, 139, 156), SkColorSetRGB(120, 120, 122)};
 
 #if defined(OS_MACOSX)
 const SkColor kDefaultColorToolbar = SkColorSetRGB(230, 230, 230);
 #else
 const SkColor kDefaultColorToolbar[] = {
     SkColorSetRGB(223, 223, 223), SkColorSetRGB(242, 242, 242)};
+const SkColor kDefaultColorToolbarIncognito[] = {
+    SkColorSetRGB(223, 223, 223), SkColorSetRGB(0x50, 0x50, 0x50)};
 #endif  // OS_MACOSX
 
 const SkColor kDefaultColorTabText = SK_ColorBLACK;
 
 #if defined(OS_MACOSX)
 const SkColor kDefaultColorBackgroundTabText = SK_ColorBLACK;
 #else
 const SkColor kDefaultColorBackgroundTabText[] = {
     SkColorSetRGB(64, 64, 64), SK_ColorBLACK };
 #endif  // OS_MACOSX
@@ skipping 175 matching lines @@
     case TINT_BACKGROUND_TAB:
       return kDefaultTintBackgroundTab;
     default:
       color_utils::HSL result = {-1, -1, -1};
       return result;
   }
 }
 
 // static
 SkColor ThemeProperties::GetDefaultColor(int id) {
+  return GetDefaultColor(id, false);
+}
+
+SkColor ThemeProperties::GetDefaultColor(int id, bool otr) {
   int mode = ui::MaterialDesignController::IsModeMaterial();
   switch (id) {
     // Properties stored in theme pack.
     case COLOR_FRAME:
 #if defined(OS_CHROMEOS)
       return kDefaultColorFrame[mode];
 #else
       return kDefaultColorFrame;
 #endif  // OS_CHROMEOS
     case COLOR_FRAME_INACTIVE:
 #if defined(OS_CHROMEOS)
       return kDefaultColorFrameInactive[mode];
 #else
       return kDefaultColorFrameInactive;
 #endif  // OS_CHROMEOS
     case COLOR_FRAME_INCOGNITO:
       return kDefaultColorFrameIncognito[mode];
     case COLOR_FRAME_INCOGNITO_INACTIVE:
       return kDefaultColorFrameIncognitoInactive[mode];
+#if defined(OS_MACOSX)
     case COLOR_TOOLBAR:
-#if defined(OS_MACOSX)
       return kDefaultColorToolbar;
 #else
-      return kDefaultColorToolbar[mode];
+    case COLOR_TOOLBAR:
+      return otr ? kDefaultColorToolbarIncognito[mode]
+                 : kDefaultColorToolbar[mode];
 #endif  // OS_MACOSX
     case COLOR_TAB_TEXT:
       return kDefaultColorTabText;
     case COLOR_BACKGROUND_TAB_TEXT:
 #if defined(OS_MACOSX)
       return kDefaultColorBackgroundTabText;
 #else
       return kDefaultColorBackgroundTabText[mode];
 #endif  // OS_MACOSX
     case COLOR_BOOKMARK_TEXT:
@@ skipping 33 matching lines @@
       return kDefaultColorToolbarBezel;
     case COLOR_TOOLBAR_STROKE:
       return kDefaultColorToolbarStroke;
     case COLOR_TOOLBAR_STROKE_INACTIVE:
       return kDefaultColorToolbarStrokeInactive;
 #endif
     default:
       return gfx::kPlaceholderColor;
   }
 }