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 169 matching lines @@
 #if defined(USE_AURA)
     if (use_new_menu_ &&
         view->GetNativeTheme() == ui::NativeThemeAura::instance()) {
       // Normal buttons get a border drawn on the right side and the rest gets
       // filled in. The left button however does not get a line to combine
       // buttons.
       int border = 0;
       if (type_ != RIGHT_BUTTON) {
         border = 1;
         canvas->FillRect(gfx::Rect(0, 0, border, h),
-                         border_color(CustomButton::STATE_NORMAL));
+                         border_color(view, CustomButton::STATE_NORMAL));
       }
       canvas->FillRect(gfx::Rect(border, 0, w - border, h),
                        touch_background_color(state));
       return;
     }
 #endif
+    const SkColor background = background_color(view, state);
+    const SkColor border = border_color(view, state);
     switch (TypeAdjustedForRTL()) {
       case LEFT_BUTTON:
-        canvas->FillRect(gfx::Rect(1, 1, w, h - 2), background_color(state));
-        canvas->FillRect(gfx::Rect(2, 0, w, 1), border_color(state));
-        canvas->FillRect(gfx::Rect(1, 1, 1, 1), border_color(state));
-        canvas->FillRect(gfx::Rect(0, 2, 1, h - 4), border_color(state));
-        canvas->FillRect(gfx::Rect(1, h - 2, 1, 1), border_color(state));
-        canvas->FillRect(gfx::Rect(2, h - 1, w, 1), border_color(state));
+        canvas->FillRect(gfx::Rect(1, 1, w, h - 2), background);
+        canvas->FillRect(gfx::Rect(2, 0, w, 1), border);
+        canvas->FillRect(gfx::Rect(1, 1, 1, 1), border);
+        canvas->FillRect(gfx::Rect(0, 2, 1, h - 4), border);
+        canvas->FillRect(gfx::Rect(1, h - 2, 1, 1), border);
+        canvas->FillRect(gfx::Rect(2, h - 1, w, 1), border);
         break;
 
       case CENTER_BUTTON: {
-        canvas->FillRect(gfx::Rect(1, 1, w - 2, h - 2),
-                         background_color(state));
+        canvas->FillRect(gfx::Rect(1, 1, w - 2, h - 2), background);
         SkColor left_color = state != CustomButton::STATE_NORMAL ?
-            border_color(state) : border_color(left_button_->state());
+            border : border_color(view, left_button_->state());
         canvas->FillRect(gfx::Rect(0, 0, 1, h), left_color);
-        canvas->FillRect(gfx::Rect(1, 0, w - 2, 1), border_color(state));
-        canvas->FillRect(gfx::Rect(1, h - 1, w - 2, 1), border_color(state));
+        canvas->FillRect(gfx::Rect(1, 0, w - 2, 1), border);
+        canvas->FillRect(gfx::Rect(1, h - 1, w - 2, 1),
+                         border);
         SkColor right_color = state != CustomButton::STATE_NORMAL ?
-            border_color(state) : border_color(right_button_->state());
+            border : border_color(view, right_button_->state());
         canvas->FillRect(gfx::Rect(w - 1, 0, 1, h), right_color);
         break;
       }
 
       case RIGHT_BUTTON:
-        canvas->FillRect(gfx::Rect(0, 1, w - 1, h - 2),
-                         background_color(state));
-        canvas->FillRect(gfx::Rect(0, 0, w - 2, 1), border_color(state));
-        canvas->FillRect(gfx::Rect(w - 2, 1, 1, 1), border_color(state));
-        canvas->FillRect(gfx::Rect(w - 1, 2, 1, h - 4), border_color(state));
-        canvas->FillRect(gfx::Rect(w - 2, h - 2, 1, 1), border_color(state));
-        canvas->FillRect(gfx::Rect(0, h - 1, w - 2, 1), border_color(state));
+        canvas->FillRect(gfx::Rect(0, 1, w - 1, h - 2), background);
+        canvas->FillRect(gfx::Rect(0, 0, w - 2, 1), border);
+        canvas->FillRect(gfx::Rect(w - 2, 1, 1, 1), border);
+        canvas->FillRect(gfx::Rect(w - 1, 2, 1, h - 4), border);
+        canvas->FillRect(gfx::Rect(w - 2, h - 2, 1, 1), border);
+        canvas->FillRect(gfx::Rect(0, h - 1, w - 2, 1), border);
         break;
 
       case SINGLE_BUTTON:
-        canvas->FillRect(gfx::Rect(1, 1, w - 2, h - 2),
-                         background_color(state));
-        canvas->FillRect(gfx::Rect(2, 0, w - 4, 1), border_color(state));
-        canvas->FillRect(gfx::Rect(1, 1, 1, 1), border_color(state));
-        canvas->FillRect(gfx::Rect(0, 2, 1, h - 4), border_color(state));
-        canvas->FillRect(gfx::Rect(1, h - 2, 1, 1), border_color(state));
-        canvas->FillRect(gfx::Rect(2, h - 1, w - 4, 1), border_color(state));
-        canvas->FillRect(gfx::Rect(w - 2, 1, 1, 1), border_color(state));
-        canvas->FillRect(gfx::Rect(w - 1, 2, 1, h - 4), border_color(state));
-        canvas->FillRect(gfx::Rect(w - 2, h - 2, 1, 1), border_color(state));
+        canvas->FillRect(gfx::Rect(1, 1, w - 2, h - 2), background);
+        canvas->FillRect(gfx::Rect(2, 0, w - 4, 1), border);
+        canvas->FillRect(gfx::Rect(1, 1, 1, 1), border);
+        canvas->FillRect(gfx::Rect(0, 2, 1, h - 4), border);
+        canvas->FillRect(gfx::Rect(1, h - 2, 1, 1), border);
+        canvas->FillRect(gfx::Rect(2, h - 1, w - 4, 1), border);
+        canvas->FillRect(gfx::Rect(w - 2, 1, 1, 1), border);
+        canvas->FillRect(gfx::Rect(w - 1, 2, 1, h - 4), border);
+        canvas->FillRect(gfx::Rect(w - 2, h - 2, 1, 1), border);
         break;
 
       default:
         NOTREACHED();
         break;
     }
   }
 
  private:
-  static SkColor border_color(CustomButton::ButtonState state) {
+#if defined(USE_AURA)

[Elliot Glaysher, 2013/03/18 21:38:21]

It's a start, but this #ifdef block still exists. All three colors should be
behind the GetSystemColor() interface so that you can delete the #else side of
this block.

[Bobby Powers, 2013/03/19 13:27:01]

Done.

+  static SkColor border_color(View* view, CustomButton::ButtonState state) {
+    ui::NativeTheme *theme = view->GetNativeTheme();
+    switch (state) {
+      case CustomButton::STATE_HOVERED:
+        return theme->GetSystemColor(
+          ui::NativeTheme::kColorId_HoverBorderColor);
+      case CustomButton::STATE_PRESSED:
+        return theme->GetSystemColor(
+          ui::NativeTheme::kColorId_FocusedBorderColor);
+      default:
+        return theme->GetSystemColor(
+          ui::NativeTheme::kColorId_MenuBorderColor);
+    }
+  }
+
+  static SkColor background_color(View* view, CustomButton::ButtonState state) {
+    ui::NativeTheme *theme = view->GetNativeTheme();
+    switch (state) {
+      case CustomButton::STATE_HOVERED:
+        return theme->GetSystemColor(
+          ui::NativeTheme::kColorId_HoverMenuItemBackgroundColor);
+      case CustomButton::STATE_PRESSED:
+        return theme->GetSystemColor(
+          ui::NativeTheme::kColorId_FocusedMenuItemBackgroundColor);
+      default:
+        return theme->GetSystemColor(
+          ui::NativeTheme::kColorId_MenuBackgroundColor);
+    }
+  }
+#else
+  static SkColor border_color(View *view, 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) {
+  static SkColor background_color(View *view, 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 127 matching lines @@
 
 }  // namespace
 
 // CutCopyPasteView ------------------------------------------------------------
 
 // CutCopyPasteView is the view containing the cut/copy/paste buttons.
 class WrenchMenu::CutCopyPasteView : public WrenchMenuView {
  public:
   CutCopyPasteView(WrenchMenu* menu,
                    MenuModel* menu_model,
+                   View* menu_view,
                    int cut_index,
                    int copy_index,
                    int paste_index)
       : WrenchMenuView(menu, menu_model) {
     LabelButton* cut = CreateAndConfigureButton(
         IDS_CUT, MenuButtonBackground::LEFT_BUTTON, cut_index, NULL);
 
     MenuButtonBackground* copy_background = NULL;
     LabelButton* copy = CreateAndConfigureButton(
         IDS_COPY, MenuButtonBackground::CENTER_BUTTON, copy_index,
         &copy_background);
 
     LabelButton* paste = CreateAndConfigureButton(
         IDS_PASTE,
         menu_->use_new_menu() && menu_->supports_new_separators_ ?
             MenuButtonBackground::CENTER_BUTTON :
             MenuButtonBackground::RIGHT_BUTTON,
         paste_index,
         NULL);
     if (menu_->use_new_menu()) {
       cut->SetTextColor(views::Button::STATE_NORMAL, kTouchButtonText);
       copy->SetTextColor(views::Button::STATE_NORMAL, kTouchButtonText);
       paste->SetTextColor(views::Button::STATE_NORMAL, kTouchButtonText);
     } else {
-      SkColor text_color = GetNativeTheme()->GetSystemColor(
+      SkColor text_color = menu_view->GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor);
       cut->SetTextColor(views::Button::STATE_NORMAL, text_color);
       copy->SetTextColor(views::Button::STATE_NORMAL, text_color);
       paste->SetTextColor(views::Button::STATE_NORMAL, text_color);
     }
     copy_background->SetOtherButtons(cut, paste);
   }
 
   // Overridden from View.
   virtual gfx::Size GetPreferredSize() OVERRIDE {
@@ skipping 33 matching lines @@
 static const int kZoomPadding = 6;
 static const int kTouchZoomPadding = 14;
 
 // ZoomView contains the various zoom controls: two buttons to increase/decrease
 // the zoom, a label showing the current zoom percent, and a button to go
 // full-screen.
 class WrenchMenu::ZoomView : public WrenchMenuView {
  public:
   ZoomView(WrenchMenu* menu,
            MenuModel* menu_model,
+           View* menu_view,
            int decrement_index,
            int increment_index,
            int fullscreen_index)
       : WrenchMenuView(menu, menu_model),
         fullscreen_index_(fullscreen_index),
         zoom_callback_(base::Bind(&WrenchMenu::ZoomView::OnZoomLevelChanged,
                                   base::Unretained(this))),
         increment_button_(NULL),
         zoom_label_(NULL),
         decrement_button_(NULL),
@@ skipping 37 matching lines @@
         ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
             IDR_FULLSCREEN_MENU_BUTTON);
     fullscreen_button_->SetImage(ImageButton::STATE_NORMAL, full_screen_image);
     if (menu_->use_new_menu()) {
       zoom_label_->SetEnabledColor(kTouchButtonText);
       decrement_button_->SetTextColor(views::Button::STATE_NORMAL,
                                       kTouchButtonText);
       increment_button_->SetTextColor(views::Button::STATE_NORMAL,
                                       kTouchButtonText);
     } else {
-      SkColor enabled_text_color = GetNativeTheme()->GetSystemColor(
+      SkColor enabled_text_color = menu_view->GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor);
       zoom_label_->SetEnabledColor(enabled_text_color);
       decrement_button_->SetTextColor(views::Button::STATE_NORMAL,
                                       enabled_text_color);
       increment_button_->SetTextColor(views::Button::STATE_NORMAL,
                                       enabled_text_color);
-      SkColor disabled_text_color = GetNativeTheme()->GetSystemColor(
+      SkColor disabled_text_color = menu_view->GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_DisabledMenuItemForegroundColor);
       decrement_button_->SetTextColor(views::Button::STATE_DISABLED,
                                       disabled_text_color);
       increment_button_->SetTextColor(views::Button::STATE_DISABLED,
                                       disabled_text_color);
     }
 
     fullscreen_button_->set_focusable(true);
     fullscreen_button_->set_request_focus_on_press(false);
     fullscreen_button_->set_tag(fullscreen_index);
@@ skipping 213 matching lines @@
 
 WrenchMenu::~WrenchMenu() {
   if (bookmark_menu_delegate_.get()) {
     BookmarkModel* model = BookmarkModelFactory::GetForProfile(
         browser_->profile());
     if (model)
       model->RemoveObserver(this);
   }
 }
 
-void WrenchMenu::Init(ui::MenuModel* model) {
+void WrenchMenu::Init(View* view, ui::MenuModel* model) {
   DCHECK(!root_);
   root_ = new MenuItemView(this);
   root_->set_has_icons(true);  // We have checks, radios and icons, set this
                                // so we get the taller menu style.
   int next_id = 1;
-  PopulateMenu(root_, model, &next_id);
+  PopulateMenu(root_, model, view, &next_id);
   first_bookmark_command_id_ = next_id + 1;
   menu_runner_.reset(new views::MenuRunner(root_));
 }
 
 void WrenchMenu::RunMenu(views::MenuButton* host) {
   gfx::Point screen_loc;
   views::View::ConvertPointToScreen(host, &screen_loc);
   gfx::Rect bounds(screen_loc, host->size());
   content::RecordAction(UserMetricsAction("ShowAppMenu"));
   if (menu_runner_->RunMenuAt(host->GetWidget(), host, bounds,
@@ skipping 219 matching lines @@
       // menu. Close the menu to avoid have a stale menu on-screen.
       root_->Cancel();
       break;
     default:
       NOTREACHED();
   }
 }
 
 void WrenchMenu::PopulateMenu(MenuItemView* parent,
                               MenuModel* model,
+                              View* view,
                               int* next_id) {
   for (int i = 0, max = model->GetItemCount(); i < max; ++i) {
     // The button container menu items have a special height which we have to
     // use instead of the normal height.
     int height = 0;
     if (use_new_menu_ &&
         (model->GetCommandIdAt(i) == IDC_CUT ||
          model->GetCommandIdAt(i) == IDC_ZOOM_MINUS))
       height = kMenuItemContainingButtonsHeight;
 
     MenuItemView* item = AppendMenuItem(
         parent, model, i, model->GetTypeAt(i), next_id, height);
 
     if (model->GetTypeAt(i) == MenuModel::TYPE_SUBMENU)
-      PopulateMenu(item, model->GetSubmenuModelAt(i), next_id);
+      PopulateMenu(item, model->GetSubmenuModelAt(i), view, next_id);
 
     switch (model->GetCommandIdAt(i)) {
       case IDC_CUT:
         DCHECK_EQ(MenuModel::TYPE_COMMAND, model->GetTypeAt(i));
         DCHECK_LT(i + 2, max);
         DCHECK_EQ(IDC_COPY, model->GetCommandIdAt(i + 1));
         DCHECK_EQ(IDC_PASTE, model->GetCommandIdAt(i + 2));
         item->SetTitle(l10n_util::GetStringUTF16(IDS_EDIT2));
-        item->AddChildView(new CutCopyPasteView(this, model, i, i + 1, i + 2));
+        item->AddChildView(new CutCopyPasteView(this, model, view,
+                                                i, i + 1, i + 2));
         i += 2;
         break;
 
       case IDC_ZOOM_MINUS:
         DCHECK_EQ(MenuModel::TYPE_COMMAND, model->GetTypeAt(i));
         DCHECK_EQ(IDC_ZOOM_PLUS, model->GetCommandIdAt(i + 1));
         DCHECK_EQ(IDC_FULLSCREEN, model->GetCommandIdAt(i + 2));
         item->SetTitle(l10n_util::GetStringUTF16(IDS_ZOOM_MENU2));
-        item->AddChildView(new ZoomView(this, model, i, i + 1, i + 2));
+        item->AddChildView(new ZoomView(this, model, view,
+                                        i, i + 1, i + 2));
         i += 2;
         break;
 
       case IDC_BOOKMARKS_MENU:
         DCHECK(!bookmark_menu_);
         bookmark_menu_ = item;
         break;
 
       case IDC_FEEDBACK:
         DCHECK(!feedback_menu_item_);
@@ skipping 73 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);
 }