ui/base/native_theme/native_theme_aura.cc - Issue 10837317: Setting the touch wrench menu as default menu for ChromeOS

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: ui/base/native_theme/native_theme_aura.cc

Issue 10837317: Setting the touch wrench menu as default menu for ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: And another merge! Created 8 years, 4 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: ui/base/native_theme/native_theme_aura.cc

diff --git a/ui/base/native_theme/native_theme_aura.cc b/ui/base/native_theme/native_theme_aura.cc

index 40c2d5f8a9014caa4b310799007f63d53f358383..f6328084896a116657577923f35c117f798b7d82 100644

--- a/ui/base/native_theme/native_theme_aura.cc

+++ b/ui/base/native_theme/native_theme_aura.cc

@@ -107,8 +107,12 @@ SkColor NativeThemeAura::GetSystemColor(ColorId color_id) const {

case kColorId_FocusedMenuItemBackgroundColor:

return kFocusedMenuItemBackgroundColor;

case kColorId_MenuSeparatorColor:

+#if defined(USE_AURA)

+ return kMenuSeparatorColorTouch;

+#else

return ui::GetDisplayLayout() == ui::LAYOUT_TOUCH ?

kMenuSeparatorColorTouch : kMenuSeparatorColor;

+#endif

// Label

case kColorId_LabelEnabledColor:

« no previous file with comments | « ui/base/models/simple_menu_model.cc ('k') | ui/ui.gyp » ('j') | no next file with comments »