ui/views/controls/menu/menu_config.h - Issue 191723003: Nukes USE_AURA ifdefs from views

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: ui/views/controls/menu/menu_config.h

Issue 191723003: Nukes USE_AURA ifdefs from views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: incorporate feedback 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:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « ui/views/controls/link.cc ('k') | ui/views/controls/menu/menu_config_win.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_CONFIG_H_	5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_CONFIG_H_

6 #define UI_VIEWS_CONTROLS_MENU_MENU_CONFIG_H_	6 #define UI_VIEWS_CONTROLS_MENU_MENU_CONFIG_H_

7	7

8 #include "third_party/skia/include/core/SkColor.h"	8 #include "third_party/skia/include/core/SkColor.h"

9 #include "ui/gfx/font_list.h"	9 #include "ui/gfx/font_list.h"

10 #include "ui/views/views_export.h"	10 #include "ui/views/views_export.h"

(...skipping 118 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
129 int show_delay;	129 int show_delay;

130	130

131 // Radius of the rounded corners of the menu border. Must be >= 0.	131 // Radius of the rounded corners of the menu border. Must be >= 0.

132 int corner_radius;	132 int corner_radius;

133	133

134 private:	134 private:

135 // Configures a MenuConfig as appropriate for the current platform.	135 // Configures a MenuConfig as appropriate for the current platform.

136 void Init(const ui::NativeTheme* theme);	136 void Init(const ui::NativeTheme* theme);

137	137

138 // TODO: temporary until we standardize.	138 // TODO: temporary until we standardize.

139 #if defined(USE_AURA)

140 void InitAura(const ui::NativeTheme* theme);	139 void InitAura(const ui::NativeTheme* theme);

141 #endif

142 };	140 };

143	141

144 } // namespace views	142 } // namespace views

145	143

146 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONFIG_H_	144 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONFIG_H_

OLD	NEW