Theme code cleanup.

ui/native_theme/common_theme.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/common_theme.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/resources/grit/ui_resources.h"
 
 namespace ui {
 
 SkColor GetAuraColor(NativeTheme::ColorId color_id,
                      const NativeTheme* base_theme) {
-  // Shared colors.
-  static const SkColor kTextfieldDefaultBackground = SK_ColorWHITE;
-  static const SkColor kTextfieldSelectionBackgroundFocused =
-      SkColorSetARGB(0x54, 0x60, 0xA8, 0xEB);
-
   // MD colors.
   if (ui::MaterialDesignController::IsModeMaterial()) {
     // Dialogs:
     static const SkColor kDialogBackgroundColorMd = SK_ColorWHITE;
     // MenuItem:
     static const SkColor kMenuHighlightBackgroundColorMd =
         SkColorSetARGB(0x14, 0x00, 0x00, 0x00);
     static const SkColor kSelectedMenuItemForegroundColorMd = SK_ColorBLACK;
     // Link:
-    static const SkColor kLinkDisabledColorMd = SK_ColorBLACK;
     static const SkColor kLinkEnabledColorMd = gfx::kGoogleBlue700;
     // Results tables:
     static const SkColor kResultsTableTextMd = SK_ColorBLACK;
     static const SkColor kResultsTableDimmedTextMd =
         SkColorSetRGB(0x64, 0x64, 0x64);
-    static const SkColor kPositiveTextColorMd = SkColorSetRGB(0x0b, 0x80, 0x43);
-    static const SkColor kNegativeTextColorMd = SkColorSetRGB(0xc5, 0x39, 0x29);
 
     switch (color_id) {
       // Dialogs
       case NativeTheme::kColorId_DialogBackground:
       case NativeTheme::kColorId_BubbleBackground:
         return kDialogBackgroundColorMd;
 
       // MenuItem
       case NativeTheme::kColorId_FocusedMenuItemBackgroundColor:
         return kMenuHighlightBackgroundColorMd;
       case NativeTheme::kColorId_SelectedMenuItemForegroundColor:
         return kSelectedMenuItemForegroundColorMd;
       // Link
-      case NativeTheme::kColorId_LinkDisabled:
-        return kLinkDisabledColorMd;
       case NativeTheme::kColorId_LinkEnabled:
       case NativeTheme::kColorId_LinkPressed:
         // Normal and pressed share a color.
         return kLinkEnabledColorMd;
 
       // FocusableBorder
       case NativeTheme::kColorId_FocusedBorderColor:
         return gfx::kGoogleBlue500;
       case NativeTheme::kColorId_UnfocusedBorderColor:
         return SkColorSetA(SK_ColorBLACK, 0x66);
 
       // Results Tables
       case NativeTheme::kColorId_ResultsTableHoveredBackground:
         return SkColorSetA(base_theme->GetSystemColor(
                                NativeTheme::kColorId_ResultsTableNormalText),
                            0x0D);
       case NativeTheme::kColorId_ResultsTableSelectedBackground:
         return SkColorSetA(base_theme->GetSystemColor(
                                NativeTheme::kColorId_ResultsTableNormalText),
                            0x14);
       case NativeTheme::kColorId_ResultsTableNormalText:
       case NativeTheme::kColorId_ResultsTableHoveredText:
       case NativeTheme::kColorId_ResultsTableSelectedText:
-      case NativeTheme::kColorId_ResultsTableNormalHeadline:
-      case NativeTheme::kColorId_ResultsTableHoveredHeadline:
-      case NativeTheme::kColorId_ResultsTableSelectedHeadline:
         return kResultsTableTextMd;
       case NativeTheme::kColorId_ResultsTableNormalDimmedText:
       case NativeTheme::kColorId_ResultsTableHoveredDimmedText:
       case NativeTheme::kColorId_ResultsTableSelectedDimmedText:
         return kResultsTableDimmedTextMd;
       case NativeTheme::kColorId_ResultsTableNormalUrl:
       case NativeTheme::kColorId_ResultsTableHoveredUrl:
       case NativeTheme::kColorId_ResultsTableSelectedUrl:
         return base_theme->GetSystemColor(NativeTheme::kColorId_LinkEnabled);
-      case NativeTheme::kColorId_ResultsTablePositiveText:
-      case NativeTheme::kColorId_ResultsTablePositiveHoveredText:
-      case NativeTheme::kColorId_ResultsTablePositiveSelectedText:
-        return kPositiveTextColorMd;
-      case NativeTheme::kColorId_ResultsTableNegativeText:
-      case NativeTheme::kColorId_ResultsTableNegativeHoveredText:
-      case NativeTheme::kColorId_ResultsTableNegativeSelectedText:
-        return kNegativeTextColorMd;
 
       default:
         break;
     }
   }
 
   // Pre-MD colors.
   // Windows:
   static const SkColor kWindowBackgroundColor = SK_ColorWHITE;
   // Dialogs:
@@ skipping 34 matching lines @@
       SkColorSetARGB(0xCC, 0xFF, 0xFF, 0xFF);
   // Label:
   static const SkColor kLabelEnabledColor = kButtonEnabledColor;
   static const SkColor kLabelBackgroundColor = SK_ColorWHITE;
   // Link:
   static const SkColor kLinkDisabledColor = SK_ColorBLACK;
   static const SkColor kLinkEnabledColor = SkColorSetRGB(0, 51, 153);
   static const SkColor kLinkPressedColor = SK_ColorRED;
   // Textfield:
   static const SkColor kTextfieldDefaultColor = SK_ColorBLACK;
+  static const SkColor kTextfieldDefaultBackground = SK_ColorWHITE;
   static const SkColor kTextfieldReadOnlyColor = SK_ColorDKGRAY;
   static const SkColor kTextfieldReadOnlyBackground = SK_ColorWHITE;
+  static const SkColor kTextfieldSelectionBackgroundFocused =
+      SkColorSetARGB(0x54, 0x60, 0xA8, 0xEB);
   static const SkColor kTextfieldSelectionColor = color_utils::AlphaBlend(
       SK_ColorBLACK, kTextfieldSelectionBackgroundFocused, 0xdd);
   // Tooltip
   static const SkColor kTooltipBackground = 0xFFFFFFCC;
   static const SkColor kTooltipTextColor = kLabelEnabledColor;
   // Tree
   static const SkColor kTreeBackground = SK_ColorWHITE;
   static const SkColor kTreeTextColor = SK_ColorBLACK;
   static const SkColor kTreeSelectedTextColor = SK_ColorBLACK;
   static const SkColor kTreeSelectionBackgroundColor =
@@ skipping 193 matching lines @@
       return kResultsTableHoveredBackground;
     case NativeTheme::kColorId_ResultsTableSelectedBackground:
       return kResultsTableSelectedBackground;
     case NativeTheme::kColorId_ResultsTableNormalText:
       return kResultsTableNormalText;
     case NativeTheme::kColorId_ResultsTableHoveredText:
       return kResultsTableHoveredText;
     case NativeTheme::kColorId_ResultsTableSelectedText:
       return kResultsTableSelectedText;
     case NativeTheme::kColorId_ResultsTableNormalDimmedText:
-    case NativeTheme::kColorId_ResultsTableNormalHeadline:
       return kResultsTableNormalDimmedText;
     case NativeTheme::kColorId_ResultsTableHoveredDimmedText:
-    case NativeTheme::kColorId_ResultsTableHoveredHeadline:
       return kResultsTableHoveredDimmedText;
     case NativeTheme::kColorId_ResultsTableSelectedDimmedText:
-    case NativeTheme::kColorId_ResultsTableSelectedHeadline:
       return kResultsTableSelectedDimmedText;
     case NativeTheme::kColorId_ResultsTableNormalUrl:
       return kResultsTableNormalUrl;
     case NativeTheme::kColorId_ResultsTableHoveredUrl:
     case NativeTheme::kColorId_ResultsTableSelectedUrl:
       return kResultsTableSelectedOrHoveredUrl;
     case NativeTheme::kColorId_ResultsTablePositiveText:
       return kResultsTablePositiveText;
     case NativeTheme::kColorId_ResultsTablePositiveHoveredText:
       return kResultsTablePositiveHoveredText;
@@ skipping 45 matching lines @@
   }
   if (menu_item.corner_radius > 0) {
     const SkScalar radius = SkIntToScalar(menu_item.corner_radius);
     canvas->drawRoundRect(gfx::RectToSkRect(rect), radius, radius, paint);
     return;
   }
   canvas->drawRect(gfx::RectToSkRect(rect), paint);
 }
 
 }  // namespace ui