Revert 116894 - Factor more colors into NativeTheme.

ui/views/controls/menu/menu_item_view_views.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/views/controls/menu/menu_item_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/favicon_size.h"
-#include "ui/gfx/native_theme.h"
+#include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_image_util.h"
 #include "ui/views/controls/menu/submenu_view.h"
 
 namespace views {
 
+// Background color when the menu item is selected.
+#if defined(OS_CHROMEOS)
+static const SkColor kSelectedBackgroundColor = SkColorSetRGB(0xDC, 0xE4, 0xFA);
+#else
+static const SkColor kSelectedBackgroundColor = SkColorSetRGB(246, 249, 253);
+#endif
+
 void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
   const MenuConfig& config = MenuConfig::instance();
   bool render_selection =
       (mode == PB_NORMAL && IsSelected() &&
        parent_menu_item_->GetSubmenu()->GetShowSelection(this) &&
        !has_children());
 
   int icon_x = config.item_left_margin;
   int top_margin = GetTopMargin();
   int bottom_margin = GetBottomMargin();
   int icon_y = top_margin + (height() - config.item_top_margin -
                              bottom_margin - config.check_height) / 2;
   int icon_height = config.check_height;
   int available_height = height() - top_margin - bottom_margin;
 
   // Render the background. As MenuScrollViewContainer draws the background, we
   // only need the background when we want it to look different, as when we're
   // selected.
-  if (render_selection) {
-    SkColor bg_color = gfx::NativeTheme::instance()->GetSystemColor(
-        gfx::NativeTheme::kColorId_FocusedMenuItemBackgroundColor);
-    canvas->GetSkCanvas()->drawColor(bg_color, SkXfermode::kSrc_Mode);
-  }
+  if (render_selection)
+    canvas->GetSkCanvas()->drawColor(kSelectedBackgroundColor,
+                                     SkXfermode::kSrc_Mode);
 
   // Render the check.
   if (type_ == CHECKBOX && GetDelegate()->IsItemChecked(GetCommand())) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     SkBitmap* check = rb.GetBitmapNamed(IDR_MENU_CHECK);
     // Don't use config.check_width here as it's padded to force more padding.
     gfx::Rect check_bounds(icon_x, icon_y, check->width(), icon_height);
     AdjustBoundsForRTLUI(&check_bounds);
     canvas->DrawBitmapInt(*check, check_bounds.x(), check_bounds.y());
   } else if (type_ == RADIO) {
     const SkBitmap* image =
         GetRadioButtonImage(GetDelegate()->IsItemChecked(GetCommand()));
     gfx::Rect radio_bounds(icon_x,
                            top_margin +
                            (height() - top_margin - bottom_margin -
                             image->height()) / 2,
                            image->width(),
                            image->height());
     AdjustBoundsForRTLUI(&radio_bounds);
     canvas->DrawBitmapInt(*image, radio_bounds.x(), radio_bounds.y());
   }
 
   // Render the foreground.
-  SkColor fg_color = gfx::NativeTheme::instance()->GetSystemColor(
-      enabled() ? gfx::NativeTheme::kColorId_EnabledMenuItemForegroundColor
-          : gfx::NativeTheme::kColorId_DisabledMenuItemForegroundColor);
-
+#if defined(OS_CHROMEOS)
+  SkColor fg_color = enabled() ? SK_ColorBLACK
+                               : SkColorSetRGB(0x80, 0x80, 0x80);
+#else
+  SkColor fg_color = enabled() ? TextButton::kEnabledColor
+                               : TextButton::kDisabledColor;
+#endif
   const gfx::Font& font = GetFont();
   int accel_width = parent_menu_item_->GetSubmenu()->max_accelerator_width();
   int width = this->width() - item_right_margin_ - label_start_ - accel_width;
   gfx::Rect text_bounds(label_start_, top_margin +
                         (available_height - font.GetHeight()) / 2, width,
                         font.GetHeight());
   text_bounds.set_x(GetMirroredXForRect(text_bounds));
   canvas->DrawStringInt(title(), font, fg_color,
                         text_bounds.x(), text_bounds.y(), text_bounds.width(),
                         text_bounds.height(),
@@ skipping 19 matching lines @@
                            top_margin + (available_height -
                                          config.arrow_width) / 2,
                            config.arrow_width, height());
     AdjustBoundsForRTLUI(&arrow_bounds);
     canvas->DrawBitmapInt(*GetSubmenuArrowImage(),
                           arrow_bounds.x(), arrow_bounds.y());
   }
 }
 
 }  // namespace views