wrench_menu: use NativeTheme colors under aura

chrome/browser/ui/views/wrench_menu.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 "chrome/browser/ui/views/wrench_menu.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 
@@ skipping 230 matching lines @@
         canvas->FillRect(gfx::Rect(w - 2, h - 2, 1, 1), border_color(state));
         break;
 
       default:
         NOTREACHED();
         break;
     }
   }
 
  private:
+#if defined(USE_AURA)

[Elliot Glaysher, 2013/03/18 17:53:40]

Please remember that aura is not a linux-only component, but is currently
shipped on chromeos and will be shipped on Windows, probably simultaneously with
linux.

Querying a NativeTheme (preferably via Views::GetNativeTheme()) is fine, but
please push the current colors up into all the subclasses of NativeTheme, and
override the colors returned only in NativeThemeGtk2. (This is something that's
been on various people's plates for a while, but is now actually a thing that
has to happen for linux_aura.)

[Bobby Powers, 2013/03/18 18:11:43]

{Unfocused,Focused,Menu}BorderColor were already defined for NativeThemeAura,
the only new color I added was HotMenuItemBackgroundColor.  I defined this for
NativeThemeAura (using the original color from wrench_menu.cc), and overrode it
in NativeThemeGtk2.  It seems like the best way to make sure it is available to
Windows & friends is to add it to CommonThemeGetSystemColor.  Does this make
sense, or should I explicitly override it NativeThemeWin?

[Bobby Powers, 2013/03/18 19:59:53]

I believe the current patch addresses this correctly.

+  static SkColor border_color(CustomButton::ButtonState state) {
+    ui::NativeTheme *theme = ui::NativeTheme::instance();
+    switch (state) {
+      case CustomButton::STATE_HOVERED:
+        return theme->GetSystemColor(
+          ui::NativeTheme::kColorId_UnfocusedBorderColor);
+      case CustomButton::STATE_PRESSED:
+        return theme->GetSystemColor(
+          ui::NativeTheme::kColorId_FocusedBorderColor);
+      default:
+        return theme->GetSystemColor(
+          ui::NativeTheme::kColorId_MenuBorderColor);
+    }
+  }
+
+  static SkColor background_color(CustomButton::ButtonState state) {
+    ui::NativeTheme *theme = ui::NativeTheme::instance();
+    switch (state) {
+      case CustomButton::STATE_HOVERED:
+        return theme->GetSystemColor(
+          ui::NativeTheme::kColorId_HotMenuItemBackgroundColor);
+      case CustomButton::STATE_PRESSED:
+        return theme->GetSystemColor(
+          ui::NativeTheme::kColorId_FocusedMenuItemBackgroundColor);
+      default:
+        return theme->GetSystemColor(
+          ui::NativeTheme::kColorId_MenuBackgroundColor);
+    }
+  }
+#else
   static SkColor border_color(CustomButton::ButtonState state) {
     switch (state) {
       case CustomButton::STATE_HOVERED: return kHotBorderColor;
       case CustomButton::STATE_PRESSED: return kPushedBorderColor;
       default:                          return kBorderColor;
     }
   }
 
   static SkColor background_color(CustomButton::ButtonState state) {
     switch (state) {
       case CustomButton::STATE_HOVERED: return kHotBackgroundColor;
       case CustomButton::STATE_PRESSED: return kPushedBackgroundColor;
       default:                          return kBackgroundColor;
     }
   }
+#endif
 
   static SkColor touch_background_color(CustomButton::ButtonState state) {
     switch (state) {
       case CustomButton::STATE_HOVERED: return kHotTouchBackgroundColor;
       case CustomButton::STATE_PRESSED: return kPushedTouchBackgroundColor;
       default:                          return kTouchBackgroundColor;
     }
   }
 
   ButtonType TypeAdjustedForRTL() const {
@@ skipping 875 matching lines @@
   bookmark_menu_delegate_.reset(
       new BookmarkMenuDelegate(browser_,
                                browser_,
                                parent,
                                first_bookmark_command_id_));
   bookmark_menu_delegate_->Init(
       this, bookmark_menu_, model->bookmark_bar_node(), 0,
       BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
       bookmark_utils::LAUNCH_WRENCH_MENU);
 }