MD - make classic theme frame colors on Linux/Win the same as CrOS.

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/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/themes/browser_theme_pack.h"
 #include "grit/theme_resources.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/resources/grit/ui_resources.h"
 
 namespace {
 
 // ----------------------------------------------------------------------------
 // Defaults for properties which are stored in the browser theme pack. If you
 // change these defaults, you must increment the version number in
 // browser_theme_pack.cc.
 
 // Default colors.
-#if defined(OS_CHROMEOS)
+#if defined(OS_MACOSX)
 // Used for theme fallback colors.
 const SkColor kDefaultColorFrame[] = {
-    SkColorSetRGB(0xC3, 0xC3, 0xC4), SkColorSetRGB(204, 204, 204)};
-const SkColor kDefaultColorFrameInactive[] = {
-    SkColorSetRGB(0xCD, 0xCD, 0xCE), SkColorSetRGB(220, 220, 220)};
-#elif defined(OS_MACOSX)
-const SkColor kDefaultColorFrame[] = {
     SkColorSetRGB(224, 224, 224), SkColorSetRGB(204, 204, 204)};
 const SkColor kDefaultColorFrameInactive[] = {
     SkColorSetRGB(246, 246, 246), SkColorSetRGB(246, 246, 246)};
 #else
-const SkColor kDefaultColorFrame = SkColorSetRGB(66, 116, 201);
-const SkColor kDefaultColorFrameInactive = SkColorSetRGB(161, 182, 228);
-#endif  // OS_CHROMEOS
+const SkColor kDefaultColorFrame[] = {
+    SkColorSetRGB(0xC3, 0xC3, 0xC4), SkColorSetRGB(204, 204, 204)};
+const SkColor kDefaultColorFrameInactive[] = {
+    SkColorSetRGB(0xCD, 0xCD, 0xCE), SkColorSetRGB(220, 220, 220)};
+#endif
 
 // These colors are the same between CrOS and !CrOS for MD, so this ifdef can be
 // removed when we stop supporting pre-MD.
 #if defined(OS_CHROMEOS)
 const SkColor kDefaultColorFrameIncognito[] = {SkColorSetRGB(0xA0, 0xA0, 0xA4),
                                                SkColorSetRGB(0x28, 0x2B, 0x2D)};
 const SkColor kDefaultColorFrameIncognitoInactive[] = {
     SkColorSetRGB(0xAA, 0xAA, 0xAE), SkColorSetRGB(0x14, 0x17, 0x19)};
 #elif defined(OS_MACOSX)
 const SkColor kDefaultColorFrameIncognito[] = {
@@ skipping 246 matching lines @@
       return {-1, -1, -1};
   }
 }
 
 // static
 SkColor ThemeProperties::GetDefaultColor(int id, bool otr) {
   int mode = ui::MaterialDesignController::IsModeMaterial();
   switch (id) {
     // Properties stored in theme pack.
     case COLOR_FRAME:
-      if (otr)
-        return kDefaultColorFrameIncognito[mode];
-#if defined(OS_CHROMEOS) || defined(OS_MACOSX)
-      return kDefaultColorFrame[mode];
-#else
-      return kDefaultColorFrame;
-#endif  // OS_CHROMEOS || OS_MACOSX
+      return otr ? kDefaultColorFrameIncognito[mode] : kDefaultColorFrame[mode];
     case COLOR_FRAME_INACTIVE:
-      if (otr)
-        return kDefaultColorFrameIncognitoInactive[mode];
-#if defined(OS_CHROMEOS) || defined(OS_MACOSX)
-      return kDefaultColorFrameInactive[mode];
-#else
-      return kDefaultColorFrameInactive;
-#endif  // OS_CHROMEOS || OS_MACOSX
+      return otr ? kDefaultColorFrameIncognitoInactive[mode]
+                 : kDefaultColorFrameInactive[mode];
     case COLOR_TOOLBAR:
       return otr ? kDefaultColorToolbarIncognito[mode]
                  : kDefaultColorToolbar[mode];
     case COLOR_TAB_TEXT:
       return otr ? kDefaultColorTabTextIncognito[mode]
                  : kDefaultColorTabText;
     case COLOR_BACKGROUND_TAB_TEXT:
       return otr ? kDefaultColorBackgroundTabTextIncognito[mode]
                  : kDefaultColorBackgroundTabText[mode];
     case COLOR_BOOKMARK_TEXT:
@@ skipping 59 matching lines @@
 #endif
     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.";
     default:
       return gfx::kPlaceholderColor;
   }
 }