linux_aura: Don't inject black in WrenchMenu::GetForegroundColor().

chrome/browser/ui/views/toolbar/wrench_menu.cc

 // Copyright 2013 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/toolbar/wrench_menu.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 
@@ skipping 830 matching lines @@
       return -1;
     const int kMaxMenuItemWidth = 320;
     return menu->GetCommand() == menu_item_->GetCommand() ?
         kMaxMenuItemWidth : -1;
   }
 
   const gfx::FontList* GetLabelFontListAt(int index) const {
     return model_->GetLabelFontListAt(index);
   }
 
-  bool GetForegroundColorAt(int index,
-                            bool is_hovered,
-                            SkColor* override_color) const {
-    // The items for which we get a font list, should be shown in black.
-    if (GetLabelFontListAt(index)) {
-      *override_color = SK_ColorBLACK;
-      return true;
-    }
-    return false;
+  bool GetShouldUseDisabledEmphasizedForegroundColor(int index) const {
+    // The items for which we get a font list, should be shown in the bolded
+    // color.
+    return GetLabelFontListAt(index) ? true : false;
   }
 
   // ui::MenuModelDelegate implementation:
 
   virtual void OnIconChanged(int index) OVERRIDE {
     int command_id = model_->GetCommandIdAt(index);
     views::MenuItemView* item = menu_item_->GetMenuItemByID(command_id);
     DCHECK(item);
     gfx::Image icon;
     model_->GetIconAt(index, &icon);
@@ skipping 126 matching lines @@
 }
 
 const gfx::FontList* WrenchMenu::GetLabelFontList(int command_id) const {
   if (IsRecentTabsCommand(command_id)) {
     return recent_tabs_menu_model_delegate_->GetLabelFontListAt(
         ModelIndexFromCommandId(command_id));
   }
   return NULL;
 }
 
-bool WrenchMenu::GetForegroundColor(int command_id,
-                                    bool is_hovered,
-                                    SkColor* override_color) const {
+bool WrenchMenu::GetShouldUseDisabledEmphasizedForegroundColor(
+    int command_id) const {
   if (IsRecentTabsCommand(command_id)) {
-    return recent_tabs_menu_model_delegate_->GetForegroundColorAt(
-        ModelIndexFromCommandId(command_id), is_hovered, override_color);
+    return recent_tabs_menu_model_delegate_->
+        GetShouldUseDisabledEmphasizedForegroundColor(
+            ModelIndexFromCommandId(command_id));
   }
   return false;
 }
 
 base::string16 WrenchMenu::GetTooltipText(int command_id,
                                           const gfx::Point& p) const {
   return IsBookmarkCommand(command_id) ?
       bookmark_menu_delegate_->GetTooltipText(command_id, p) : base::string16();
 }
 
@@ skipping 339 matching lines @@
                                 0,
                                 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
                                 BOOKMARK_LAUNCH_LOCATION_WRENCH_MENU);
 }
 
 int WrenchMenu::ModelIndexFromCommandId(int command_id) const {
   CommandIDToEntry::const_iterator ix = command_id_to_entry_.find(command_id);
   DCHECK(ix != command_id_to_entry_.end());
   return ix->second.second;
 }