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

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

Issue 12310024: Changed menu accelerators color and copy/paste/zoom buttons in wrench menu to match rest of the men… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 | « no previous file | 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/wrench_menu.cc
diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc
index 04652aac9f4b750cc37839ad602e1635625ec0f6..40e8abd580844ef5d2029caf30bfbfd54c0fb6f4 100644
--- a/chrome/browser/ui/views/wrench_menu.cc
+++ b/chrome/browser/ui/views/wrench_menu.cc
@@ -434,6 +434,12 @@ class WrenchMenu::CutCopyPasteView : public WrenchMenuView {
cut->SetEnabledColor(kTouchButtonText);
copy->SetEnabledColor(kTouchButtonText);
paste->SetEnabledColor(kTouchButtonText);
+ } else {
+ SkColor text_color = GetNativeTheme()->GetSystemColor(
+ ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor);
+ cut->SetEnabledColor(text_color);
+ copy->SetEnabledColor(text_color);
+ paste->SetEnabledColor(text_color);
}
copy_background->SetOtherButtons(cut, paste);
}
@@ -538,7 +544,15 @@ class WrenchMenu::ZoomView : public WrenchMenuView {
decrement_button_->SetEnabledColor(kTouchButtonText);
increment_button_->SetEnabledColor(kTouchButtonText);
} else {
- zoom_label_->SetEnabledColor(menu_config.text_color);
+ SkColor enabled_text_color = GetNativeTheme()->GetSystemColor(
+ ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor);
+ zoom_label_->SetEnabledColor(enabled_text_color);
+ decrement_button_->SetEnabledColor(enabled_text_color);
+ increment_button_->SetEnabledColor(enabled_text_color);
+ SkColor disabled_text_color = GetNativeTheme()->GetSystemColor(
+ ui::NativeTheme::kColorId_DisabledMenuItemForegroundColor);
+ decrement_button_->SetDisabledColor(disabled_text_color);
+ increment_button_->SetDisabledColor(disabled_text_color);
}
fullscreen_button_->set_focusable(true);
« no previous file with comments | « no previous file | ui/native_theme/common_theme.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698