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

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

Issue 117903006: Refactor: Makes menus use gfx::FontList instead of gfx::Font. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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
OLDNEW
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.h" 9 #include "ui/gfx/font_list.h"
10 #include "ui/views/views_export.h" 10 #include "ui/views/views_export.h"
11 11
12 namespace ui { 12 namespace ui {
13 class NativeTheme; 13 class NativeTheme;
14 } 14 }
15 15
16 namespace views { 16 namespace views {
17 17
18 // Layout type information for menu items. Use the instance() method to obtain 18 // Layout type information for menu items. Use the instance() method to obtain
19 // the MenuConfig for the current platform. 19 // the MenuConfig for the current platform.
20 struct VIEWS_EXPORT MenuConfig { 20 struct VIEWS_EXPORT MenuConfig {
21 explicit MenuConfig(const ui::NativeTheme* theme); 21 explicit MenuConfig(const ui::NativeTheme* theme);
22 ~MenuConfig(); 22 ~MenuConfig();
23 23
24 static const MenuConfig& instance(const ui::NativeTheme* theme); 24 static const MenuConfig& instance(const ui::NativeTheme* theme);
25 25
26 // Font used by menus. 26 // Font list used by menus.
27 gfx::Font font; 27 gfx::FontList font_list;
28 28
29 // Normal text color. 29 // Normal text color.
30 SkColor text_color; 30 SkColor text_color;
31 31
32 // Color for the arrow to scroll bookmarks. 32 // Color for the arrow to scroll bookmarks.
33 SkColor arrow_color; 33 SkColor arrow_color;
34 34
35 // Menu border sizes. 35 // Menu border sizes.
36 int menu_vertical_border_size; 36 int menu_vertical_border_size;
37 int menu_horizontal_border_size; 37 int menu_horizontal_border_size;
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 137
138 // TODO: temporary until we standardize. 138 // TODO: temporary until we standardize.
139 #if defined(USE_AURA) 139 #if defined(USE_AURA)
140 void InitAura(const ui::NativeTheme* theme); 140 void InitAura(const ui::NativeTheme* theme);
141 #endif 141 #endif
142 }; 142 };
143 143
144 } // namespace views 144 } // namespace views
145 145
146 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONFIG_H_ 146 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONFIG_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698