Factor more colors into NativeTheme.

ui/gfx/native_theme_aura.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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_aura.h"
 
 #include "base/basictypes.h"
+#include "base/logging.h"
 #include "grit/gfx_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skbitmap_operations.h"
 
 namespace {
 
 const SkColor kMenuBackgroundColor = SkColorSetRGB(0xed, 0xed, 0xed);
 
+// Theme colors returned by GetSystemColor().
+const SkColor kInvalidColorIdColor = SkColorSetRGB(255, 0, 128);
+// Dialogs:
+const SkColor kDefaultDialogBackgroundColor = SkColorSetRGB(200, 200, 200);

[benrg, 2012/01/06 19:38:01]

Change kDefault* to kAura* or just k* since these are the platform colors (the
colors in NativeThemeBase were overridable defaults). Ditto in
native_theme_chromeos.cc.

[Emmanuel Saint-loubert-Bié, 2012/01/06 21:51:07]

Done.

+// FocusableBorder:
+const SkColor kDefaultFocusedBorderColor = SkColorSetRGB(0x4D, 0x90, 0xFE);
+const SkColor kDefaultUnfocusedBorderColor = SkColorSetRGB(0xD9, 0xD9, 0xD9);
+// TextButton:
+const SkColor kDefaultTextButtonBackgroundColor =
+    SkColorSetRGB(0xDE, 0xDE, 0xDE);
+const SkColor kDefaultTextButtonEnabledColor = SkColorSetRGB(0x44, 0x44, 0x44);
+const SkColor kDefaultTextButtonDisabledColor = SkColorSetRGB(0x99, 0x99, 0x99);
+const SkColor kDefaultTextButtonHighlightColor = SkColorSetRGB(0, 0, 0);
+const SkColor kDefaultTextButtonHoverColor = kDefaultTextButtonEnabledColor;
+// MenuItem:
+const SkColor kDefaultEnabledMenuItemForegroundColor = SK_ColorBLACK;
+const SkColor kDefaultDisabledMenuItemForegroundColor =
+    SkColorSetRGB(0x80, 0x80, 0x80);
+const SkColor kDefaultFocusedMenuItemBackgroundColor =
+    SkColorSetRGB(0xDC, 0xE4, 0xFA);

[benrg, 2012/01/06 19:38:01]

These are the ChromeOS values. The !defined(OS_CHROMEOS) values in the original
code were kDefaultTextButtonEnabledColor, kDefaultTextButtonDisabledColor, and
SkColorSetRGB(246, 249, 253).

[Emmanuel Saint-loubert-Bié, 2012/01/06 21:51:07]

I hesitated and I think we should start with the chromeos ones values for Aura
(when undefined like in this case). 

+
 }  // namespace
 
 namespace gfx {
 
 // static
 const NativeTheme* NativeTheme::instance() {
   return NativeThemeAura::instance();
 }
 
 // static
 const NativeThemeAura* NativeThemeAura::instance() {
   CR_DEFINE_STATIC_LOCAL(NativeThemeAura, s_native_theme, ());
   return &s_native_theme;
 }
 
 NativeThemeAura::NativeThemeAura() {
 }
 
 NativeThemeAura::~NativeThemeAura() {
 }
 
+SkColor NativeThemeAura::GetSystemColor(ColorId color_id) const {
+  // This implementation returns hardcoded colors.
+  switch (color_id) {
+
+    // Dialogs
+    case kColorId_DialogBackground:
+      return kDefaultDialogBackgroundColor;
+
+    // FocusableBorder
+    case kColorId_FocusedBorderColor:
+      return kDefaultFocusedBorderColor;
+    case kColorId_UnfocusedBorderColor:
+      return kDefaultUnfocusedBorderColor;
+
+    // TextButton
+    case kColorId_TextButtonBackgroundColor:
+      return kDefaultTextButtonBackgroundColor;
+    case kColorId_TextButtonEnabledColor:
+      return kDefaultTextButtonEnabledColor;
+    case kColorId_TextButtonDisabledColor:
+      return kDefaultTextButtonDisabledColor;
+    case kColorId_TextButtonHighlightColor:
+      return kDefaultTextButtonHighlightColor;
+    case kColorId_TextButtonHoverColor:
+      return kDefaultTextButtonHoverColor;
+
+    // MenuItem
+    case kColorId_EnabledMenuItemForegroundColor:
+      return kDefaultEnabledMenuItemForegroundColor;
+    case kColorId_DisabledMenuItemForegroundColor:
+      return kDefaultDisabledMenuItemForegroundColor;
+    case kColorId_FocusedMenuItemBackgroundColor:
+      return kDefaultFocusedMenuItemBackgroundColor;
+    default:
+      NOTREACHED() << "Invalid color_id: " << color_id;
+      break;
+  }
+
+  // Return InvalidColor
+  return kInvalidColorIdColor;
+}
+
 void NativeThemeAura::PaintMenuPopupBackground(
     SkCanvas* canvas,
     State state,
     const gfx::Rect& rect,
     const MenuListExtraParams& menu_list) const {
   canvas->drawColor(kMenuBackgroundColor, SkXfermode::kSrc_Mode);
 }
 
 void NativeThemeAura::PaintScrollbarTrack(
     SkCanvas* canvas,
@@ skipping 120 matching lines @@
         SkBitmapOperations::CreateTransposedBtmap(*vertical_bitmap);
     SkBitmap* horizontal_bitmap = new SkBitmap(transposed_bitmap);
 
     horizontal_bitmaps_[resource_id] = horizontal_bitmap;
     return horizontal_bitmap;
   }
   return NULL;
 }
 
 }  // namespace gfx