Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6907)

Unified Diff: chrome/browser/ui/views/toolbar/wrench_menu.cc

Issue 205153003: linux_aura: Don't inject black in WrenchMenu::GetForegroundColor(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sky rename request Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/toolbar/wrench_menu.h ('k') | ui/native_theme/common_theme.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/toolbar/wrench_menu.cc
diff --git a/chrome/browser/ui/views/toolbar/wrench_menu.cc b/chrome/browser/ui/views/toolbar/wrench_menu.cc
index 8a0e57e9091bdb1e42c60dd90b84338d1c84d322..68a877c03f22a395f7a7d3f4c43d78bb3ddc7c08 100644
--- a/chrome/browser/ui/views/toolbar/wrench_menu.cc
+++ b/chrome/browser/ui/views/toolbar/wrench_menu.cc
@@ -848,15 +848,10 @@ class WrenchMenu::RecentTabsMenuModelDelegate : public ui::MenuModelDelegate {
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:
@@ -1003,12 +998,12 @@ const gfx::FontList* WrenchMenu::GetLabelFontList(int command_id) const {
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;
}
« no previous file with comments | « chrome/browser/ui/views/toolbar/wrench_menu.h ('k') | ui/native_theme/common_theme.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698