chrome/browser/ui/views/toolbar/wrench_menu.h - Issue 205153003: linux_aura: Don't inject black in WrenchMenu::GetForegroundColor().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

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:

Index: chrome/browser/ui/views/toolbar/wrench_menu.h

diff --git a/chrome/browser/ui/views/toolbar/wrench_menu.h b/chrome/browser/ui/views/toolbar/wrench_menu.h

index 32da47b6caeaf97232f8d38f9536e446ce941217..97951564b60b07ddb53fd3703612345d9421c010 100644

--- a/chrome/browser/ui/views/toolbar/wrench_menu.h

+++ b/chrome/browser/ui/views/toolbar/wrench_menu.h

@@ -60,11 +60,10 @@ class WrenchMenu : public views::MenuDelegate,

// MenuDelegate overrides:

virtual const gfx::FontList* GetLabelFontList(int command_id) const OVERRIDE;

- virtual bool GetForegroundColor(int command_id,

- bool is_hovered,

- SkColor* override_color) const OVERRIDE;

+ virtual bool GetShouldUseDisabledEmphasizedForegroundColor(

+ int command_id) const OVERRIDE;

virtual base::string16 GetTooltipText(int command_id,

- const gfx::Point& p) const OVERRIDE;

+ const gfx::Point& p) const OVERRIDE;

virtual bool IsTriggerableEvent(views::MenuItemView* menu,

const ui::Event& e) OVERRIDE;

virtual bool GetDropFormats(