Add a new GetSystemColor method to native theme.

ui/gfx/native_theme_base.cc

 // Copyright (c) 2011 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 {
+
+// Hardcoded colors for use when there is no system theme (Aura, ChromeOS).
+const SkColor kDefaultDialogBackgroundColor = SkColorSetRGB(200, 200, 200);
+const SkColor kInvalidColorIdColor = SkColorSetRGB(255, 0, 128);
+
+}  // namespace
+
 namespace gfx {
 
 unsigned int NativeThemeBase::button_length_ = 14;
 #if defined(TOUCH_UI)
 unsigned int NativeThemeBase::scrollbar_width_ = 0;
 #else
 unsigned int NativeThemeBase::scrollbar_width_ = 15;
 #endif
 
 // These are the default dimensions of radio buttons and checkboxes.
@@ skipping 23 matching lines @@
 
   return color_utils::HSLToSkColor(adjusted, alpha);
 }
 
 NativeThemeBase::NativeThemeBase() {
 }
 
 NativeThemeBase::~NativeThemeBase() {
 }
 
+// This implementation returns hardcoded colors. It's used by NativeThemeAura
+// and NativeThemeChromeos and overridden by NativeThemeGtk.

[Ben Goodger (Google), 2011/11/21 18:59:59]

comment moves inside function.

[benrg, 2011/11/21 19:54:20]

Done.

+SkColor NativeThemeBase::GetSystemColor(ColorId color_id) const {

[Ben Goodger (Google), 2011/11/21 18:59:59]

order in .cc must match .h

[benrg, 2011/11/21 19:54:20]

Independently for each protection level, I guess; is this in the style guide?

[Ben Goodger (Google), 2011/11/22 15:49:50]

Sort of, it's in the Chrome-specific overrides:

http://dev.chromium.org/developers/coding-style

[benrg, 2011/11/22 21:43:49]

In the newest patch set, NativeThemeBase::GetSystemColor is in order with
respect to the other public methods of NativeThemeBase. The public, protected,
and private method definitions are interleaved with each other, but I would have
to rearrange a lot of functions that I didn't modify to fix that.

+  switch (color_id) {
+    case kDialogBackgroundColorId:
+      return kDefaultDialogBackgroundColor;
+    default:
+      NOTREACHED() << "Invalid color_id: " << color_id;
+      break;
+  }
+  return kInvalidColorIdColor;
+}
+
 gfx::Size NativeThemeBase::GetPartSize(Part part,
                                        State state,
                                        const ExtraParams& extra) const {
   switch (part) {
     // Please keep these in the order of NativeTheme::Part.
     case kCheckbox:
       return gfx::Size(kCheckboxAndRadioWidth, kCheckboxAndRadioHeight);
     case kInnerSpinButton:
       return gfx::Size(scrollbar_width_, 0);
     case kMenuList:
@@ skipping 915 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