Revert 116894 - Factor more colors into NativeTheme.

ui/gfx/native_theme_aura.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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_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 kDialogBackgroundColor = SkColorSetRGB(200, 200, 200);
-// FocusableBorder:
-const SkColor kFocusedBorderColor = SkColorSetRGB(0x4D, 0x90, 0xFE);
-const SkColor kUnfocusedBorderColor = SkColorSetRGB(0xD9, 0xD9, 0xD9);
-// TextButton:
-const SkColor kTextButtonBackgroundColor = SkColorSetRGB(0xDE, 0xDE, 0xDE);
-const SkColor kTextButtonEnabledColor = SkColorSetRGB(0x44, 0x44, 0x44);
-const SkColor kTextButtonDisabledColor = SkColorSetRGB(0x99, 0x99, 0x99);
-const SkColor kTextButtonHighlightColor = SkColorSetRGB(0, 0, 0);
-const SkColor kTextButtonHoverColor = kTextButtonEnabledColor;
-// MenuItem:
-const SkColor kEnabledMenuItemForegroundColor = SK_ColorBLACK;
-const SkColor kDisabledMenuItemForegroundColor =
-    SkColorSetRGB(0x80, 0x80, 0x80);
-const SkColor kFocusedMenuItemBackgroundColor = SkColorSetRGB(0xDC, 0xE4, 0xFA);
-
 }  // 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 kDialogBackgroundColor;
-
-    // FocusableBorder
-    case kColorId_FocusedBorderColor:
-      return kFocusedBorderColor;
-    case kColorId_UnfocusedBorderColor:
-      return kUnfocusedBorderColor;
-
-    // TextButton
-    case kColorId_TextButtonBackgroundColor:
-      return kTextButtonBackgroundColor;
-    case kColorId_TextButtonEnabledColor:
-      return kTextButtonEnabledColor;
-    case kColorId_TextButtonDisabledColor:
-      return kTextButtonDisabledColor;
-    case kColorId_TextButtonHighlightColor:
-      return kTextButtonHighlightColor;
-    case kColorId_TextButtonHoverColor:
-      return kTextButtonHoverColor;
-
-    // MenuItem
-    case kColorId_EnabledMenuItemForegroundColor:
-      return kEnabledMenuItemForegroundColor;
-    case kColorId_DisabledMenuItemForegroundColor:
-      return kDisabledMenuItemForegroundColor;
-    case kColorId_FocusedMenuItemBackgroundColor:
-      return kFocusedMenuItemBackgroundColor;
-    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