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

Unified Diff: ui/views/controls/menu/menu_config.h

Issue 1477253002: Use a single views::MenuConfig instance for each platform (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add menu_config_android Created 5 years 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/views/controls/combobox/combobox.cc ('k') | ui/views/controls/menu/menu_config.cc » ('j') | no next file with comments »
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 2a43acab644c42255e1060f3854006c782a4c629..6bbf4e8f4f4d57b51ee72edec021bf99e842c85b 100644
--- a/ui/views/controls/menu/menu_config.h
+++ b/ui/views/controls/menu/menu_config.h
@@ -9,19 +9,15 @@
#include "ui/gfx/font_list.h"
#include "ui/views/views_export.h"
-namespace ui {
-class NativeTheme;
-}
-
namespace views {
// Layout type information for menu items. Use the instance() method to obtain
// the MenuConfig for the current platform.
struct VIEWS_EXPORT MenuConfig {
- explicit MenuConfig(const ui::NativeTheme* theme);
+ MenuConfig();
~MenuConfig();
- static const MenuConfig& instance(const ui::NativeTheme* theme);
+ static const MenuConfig& instance();
// Font list used by menus.
gfx::FontList font_list;
@@ -125,10 +121,7 @@ struct VIEWS_EXPORT MenuConfig {
private:
// Configures a MenuConfig as appropriate for the current platform.
- void Init(const ui::NativeTheme* theme);
-
- // TODO: temporary until we standardize.
- void InitAura(const ui::NativeTheme* theme);
+ void Init();
};
} // namespace views
« no previous file with comments | « ui/views/controls/combobox/combobox.cc ('k') | ui/views/controls/menu/menu_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698