Theme code cleanup.

ui/native_theme/native_theme_win.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 "ui/native_theme/native_theme_win.h"
 
 #include <windows.h>
 #include <stddef.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
@@ skipping 447 matching lines @@
       PaintWindowResizeGripper(hdc, rect);
       return;
     case kSliderTrack:
     case kSliderThumb:
     case kMaxPart:
       NOTREACHED();
   }
 }
 
 SkColor NativeThemeWin::GetSystemColor(ColorId color_id) const {
+  if (!ui::MaterialDesignController::IsModeMaterial()) {
+    // Link:
+    const SkColor kLinkPressedColor = SkColorSetRGB(200, 0, 0);
+
+    switch (color_id) {
+      // Link
+      case kColorId_LinkDisabled:
+        return system_colors_[COLOR_WINDOWTEXT];
+      case kColorId_LinkEnabled:
+        return system_colors_[COLOR_HOTLIGHT];
+      case kColorId_LinkPressed:
+        return kLinkPressedColor;
+
+      default:
+        break;
+    }
+  }
+
   // TODO: Obtain the correct colors using GetSysColor.
-  const SkColor kUrlTextColor = SkColorSetRGB(0x0b, 0x80, 0x43);
   // Dialogs:
   const SkColor kDialogBackgroundColor = SkColorSetRGB(251, 251, 251);
   // FocusableBorder:
   const SkColor kFocusedBorderColor = SkColorSetRGB(0x4d, 0x90, 0xfe);
   const SkColor kUnfocusedBorderColor = SkColorSetRGB(0xd9, 0xd9, 0xd9);
   // Button:
   const SkColor kButtonBackgroundColor = SkColorSetRGB(0xde, 0xde, 0xde);
   const SkColor kButtonHighlightColor = SkColorSetARGB(200, 255, 255, 255);
   const SkColor kButtonHoverColor = SkColorSetRGB(6, 45, 117);
   const SkColor kCallToActionColorInvert = gfx::kGoogleBlue300;
   // MenuItem:
   const SkColor kMenuSchemeHighlightBackgroundColorInvert =
       SkColorSetRGB(0x30, 0x30, 0x30);
-  // Link:
-  const SkColor kLinkPressedColor = SkColorSetRGB(200, 0, 0);
   // Table:
   const SkColor kPositiveTextColor = SkColorSetRGB(0x0b, 0x80, 0x43);
   const SkColor kNegativeTextColor = SkColorSetRGB(0xc5, 0x39, 0x29);
+  // Results Tables:
+  const SkColor kResultsTableUrlColor = SkColorSetRGB(0x0b, 0x80, 0x43);
 
   switch (color_id) {
     // Windows
     case kColorId_WindowBackground:
       return system_colors_[COLOR_WINDOW];
 
     // Dialogs
     case kColorId_DialogBackground:
     case kColorId_BubbleBackground:
       return color_utils::IsInvertedColorScheme() ?
@@ skipping 17 matching lines @@
       return kButtonHoverColor;
 
     // Label
     case kColorId_LabelEnabledColor:
       return system_colors_[COLOR_BTNTEXT];
     case kColorId_LabelDisabledColor:
       return system_colors_[COLOR_GRAYTEXT];
     case kColorId_LabelBackgroundColor:
       return system_colors_[COLOR_WINDOW];
 
-    // Link
-    case kColorId_LinkDisabled:
-      if (ui::MaterialDesignController::IsModeMaterial())
-        break;
-      return system_colors_[COLOR_WINDOWTEXT];
-    case kColorId_LinkEnabled:
-      if (ui::MaterialDesignController::IsModeMaterial())
-        break;
-      return system_colors_[COLOR_HOTLIGHT];
-    case kColorId_LinkPressed:
-      if (ui::MaterialDesignController::IsModeMaterial())
-        break;
-      return kLinkPressedColor;
-
     // Textfield
     case kColorId_TextfieldDefaultColor:
       return system_colors_[COLOR_WINDOWTEXT];
     case kColorId_TextfieldDefaultBackground:
       return system_colors_[COLOR_WINDOW];
     case kColorId_TextfieldReadOnlyColor:
       return system_colors_[COLOR_GRAYTEXT];
     case kColorId_TextfieldReadOnlyBackground:
       return system_colors_[COLOR_3DFACE];
     case kColorId_TextfieldSelectionColor:
@@ skipping 62 matching lines @@
       return color_utils::AlphaBlend(system_colors_[COLOR_WINDOWTEXT],
                                      system_colors_[COLOR_WINDOW], 0x80);
     case kColorId_ResultsTableHoveredDimmedText:
       return color_utils::AlphaBlend(
           system_colors_[COLOR_WINDOWTEXT],
           GetSystemColor(kColorId_ResultsTableHoveredBackground), 0x80);
     case kColorId_ResultsTableSelectedDimmedText:
       return color_utils::AlphaBlend(system_colors_[COLOR_HIGHLIGHTTEXT],
                                      system_colors_[COLOR_HIGHLIGHT], 0x80);
     case kColorId_ResultsTableNormalUrl:
-      return color_utils::GetReadableColor(kUrlTextColor,
-                                           system_colors_[COLOR_WINDOW]);
+      return color_utils::GetReadableColor(kResultsTableUrlColor,
+                                            system_colors_[COLOR_WINDOW]);
     case kColorId_ResultsTableHoveredUrl:
       return color_utils::GetReadableColor(
-          kUrlTextColor,
+          kResultsTableUrlColor,
           GetSystemColor(kColorId_ResultsTableHoveredBackground));
     case kColorId_ResultsTableSelectedUrl:
-      return color_utils::GetReadableColor(kUrlTextColor,
+      return color_utils::GetReadableColor(kResultsTableUrlColor,
                                            system_colors_[COLOR_HIGHLIGHT]);
     case kColorId_ResultsTablePositiveText:
       return color_utils::GetReadableColor(kPositiveTextColor,
                                            system_colors_[COLOR_WINDOW]);
     case kColorId_ResultsTablePositiveHoveredText:
       return color_utils::GetReadableColor(
           kPositiveTextColor,
           GetSystemColor(kColorId_ResultsTableHoveredBackground));
     case kColorId_ResultsTablePositiveSelectedText:
       return color_utils::GetReadableColor(kPositiveTextColor,
@@ skipping 1433 matching lines @@
     break;
   case LAST:
     NOTREACHED();
     break;
   }
   theme_handles_[theme_name] = handle;
   return handle;
 }
 
 }  // namespace ui