ui/views/controls/menu/menu_scroll_view_container.cc - Issue 267593005: Refactor menu controller to isolate aura dependency.

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/views/controls/menu/menu_scroll_view_container.cc

Issue 267593005: Refactor menu controller to isolate aura dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to master. Fixes for tapted. Created 6 years, 7 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/views/controls/menu/menu_scroll_view_container.cc

diff --git a/ui/views/controls/menu/menu_scroll_view_container.cc b/ui/views/controls/menu/menu_scroll_view_container.cc

index 1712fbac613a4a69eb1d7c30849dd07fcd0b13c2..9201c4af7f4d7f46e19df53435b59d5d9d256bc0 100644

--- a/ui/views/controls/menu/menu_scroll_view_container.cc

+++ b/ui/views/controls/menu/menu_scroll_view_container.cc

@@ -281,7 +281,7 @@ void MenuScrollViewContainer::CreateDefaultBorder() {

int padding = menu_config.corner_radius > 0 ?

kBorderPaddingDueToRoundedCorners : 0;

-#if !(defined(OS_LINUX) && !defined(OS_CHROMEOS))

+#if defined(USE_AURA) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS))

if (menu_config.native_theme == ui::NativeThemeAura::instance()) {

// In case of NativeThemeAura the border gets drawn with the shadow.

// Furthermore no additional padding is wanted.