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

Unified Diff: ui/views/controls/menu/menu_item_view.h

Issue 2700473002: MenuItemView: use disabled text color for subtitles too (Closed)
Patch Set: Created 3 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
Index: ui/views/controls/menu/menu_item_view.h
diff --git a/ui/views/controls/menu/menu_item_view.h b/ui/views/controls/menu/menu_item_view.h
index ec8aa982884f35ea139c0994dc608b08d83d62d2..51768071d089e666f416a4017274dca44f9f569b 100644
--- a/ui/views/controls/menu/menu_item_view.h
+++ b/ui/views/controls/menu/menu_item_view.h
@@ -389,7 +389,7 @@ class VIEWS_EXPORT MenuItemView : public View {
void PaintButton(gfx::Canvas* canvas, PaintButtonMode mode);
// Paints the right-side text.
- void PaintMinorText(gfx::Canvas* canvas, bool render_selection);
+ void PaintMinorText(gfx::Canvas* canvas, SkColor color);
// Destroys the window used to display this menu and recursively destroys
// the windows used to display all descendants.
@@ -399,6 +399,12 @@ class VIEWS_EXPORT MenuItemView : public View {
// item. This will be the accelerator (if one exists), otherwise |subtitle_|.
base::string16 GetMinorText() const;
+ // Returns the text color for the current state. |minor| specifies if the
+ // minor text or the normal text is desired.
+ SkColor GetTextColor(bool minor,
+ bool render_selection,
+ bool emphasized) const;
+
// Calculates and returns the MenuItemDimensions.
MenuItemDimensions CalculateDimensions() const;

Powered by Google App Engine
This is Rietveld 408576698