Factor more colors into NativeTheme.

ui/gfx/native_theme_base.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/gfx/native_theme_base.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "grit/gfx_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 namespace {
 
-// Hard-coded colors for use when there is no system theme (Aura, ChromeOS).
-#if defined(USE_AURA)
-const SkColor kDefaultDialogBackgroundColor = SK_ColorWHITE;
-#else
-const SkColor kDefaultDialogBackgroundColor = SkColorSetRGB(200, 200, 200);
-#endif
-const SkColor kDefaultFocusedBorderColor= SkColorSetRGB(0x4D, 0x90, 0xFE);
-const SkColor kDefaultUnfocusedBorderColor = SkColorSetRGB(0xD9, 0xD9, 0xD9);
-const SkColor kInvalidColorIdColor = SkColorSetRGB(255, 0, 128);
-
 // These are the default dimensions of radio buttons and checkboxes.
 const int kCheckboxAndRadioWidth = 13;
 const int kCheckboxAndRadioHeight = 13;
 
 // These sizes match the sizes in Chromium Win.
 const int kSliderThumbWidth = 11;
 const int kSliderThumbHeight = 21;
 
 const SkColor kSliderTrackBackgroundColor =
     SkColorSetRGB(0xe3, 0xdd, 0xd8);
@@ skipping 166 matching lines @@
     case kTrackbarTrack:
     case kWindowResizeGripper:
       NOTIMPLEMENTED();
       break;
     default:
       NOTREACHED() << "Unknown theme part: " << part;
       break;
   }
 }
 
-SkColor NativeThemeBase::GetSystemColor(ColorId color_id) const {
-  // This implementation returns hardcoded colors. It's used by NativeThemeAura
-  // and NativeThemeChromeos and overridden by NativeThemeGtk.
-  switch (color_id) {
-    case kColorId_DialogBackground:
-      return kDefaultDialogBackgroundColor;
-    case kColorId_FocusedBorderColor:
-      return kDefaultFocusedBorderColor;
-    case kColorId_UnfocusedBorderColor:
-      return kDefaultUnfocusedBorderColor;
-    default:
-      NOTREACHED() << "Invalid color_id: " << color_id;
-      break;
-  }
-  return kInvalidColorIdColor;
-}
-
 NativeThemeBase::NativeThemeBase() {
 }
 
 NativeThemeBase::~NativeThemeBase() {
 }
 
 void NativeThemeBase::PaintArrowButton(
     SkCanvas* canvas,
     const gfx::Rect& rect, Part direction, State state) const {
   int widthMiddle, lengthMiddle;
@@ skipping 770 matching lines @@
   SkScalar min_diff = Clamp((hsv1[1] + hsv2[1]) * 1.2f, 0.28f, 0.5f);
   SkScalar diff = Clamp(fabs(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5f);
 
   if (hsv1[2] + hsv2[2] > 1.0)
     diff = -diff;
 
   return SaturateAndBrighten(hsv2, -0.2f, diff);
 }
 
 }  // namespace gfx