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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/models/menu_model.cc ('k') | ui/views/controls/menu/menu_config_views.cc » ('j') | ui/views/controls/menu/menu_config_views.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_config.h
diff --git a/ui/views/controls/menu/menu_config.h b/ui/views/controls/menu/menu_config.h
index 96eb21ac2192c7cbb30e8cd8ede42f686378d750..fac60e80c3f46b244360b5414f47e1b0e1c84ae0 100644
--- a/ui/views/controls/menu/menu_config.h
+++ b/ui/views/controls/menu/menu_config.h
@@ -6,7 +6,7 @@
#define UI_VIEWS_CONTROLS_MENU_MENU_CONFIG_H_
#include "third_party/skia/include/core/SkColor.h"
-#include "ui/gfx/font.h"
+#include "ui/gfx/font_list.h"
#include "ui/views/views_export.h"
namespace ui {
@@ -23,8 +23,8 @@ struct VIEWS_EXPORT MenuConfig {
static const MenuConfig& instance(const ui::NativeTheme* theme);
- // Font used by menus.
- gfx::Font font;
+ // Font list used by menus.
+ gfx::FontList font_list;
// Normal text color.
SkColor text_color;
« no previous file with comments | « ui/base/models/menu_model.cc ('k') | ui/views/controls/menu/menu_config_views.cc » ('j') | ui/views/controls/menu/menu_config_views.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698