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

Unified Diff: ui/views/controls/menu/menu_config_mac.mm

Issue 1514693006: Revert of Use a single views::MenuConfig instance for each platform (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase revert on https://codereview.chromium.org/1504743003 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/menu/menu_config_linux.cc ('k') | ui/views/controls/menu/menu_config_win.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_mac.mm
diff --git a/ui/views/controls/menu/menu_config_mac.mm b/ui/views/controls/menu/menu_config_mac.mm
index 9c73a1f23891603a7433d1b8042024d41e3bebce..78d6a2cc7f5fc7bdfd9e0351403c68026a5f1c7f 100644
--- a/ui/views/controls/menu/menu_config_mac.mm
+++ b/ui/views/controls/menu/menu_config_mac.mm
@@ -6,9 +6,14 @@
#import <AppKit/AppKit.h>
+#include "ui/gfx/image/image_skia.h"
+#include "ui/native_theme/native_theme_mac.h"
+#include "ui/views/controls/menu/menu_image_util.h"
+
namespace views {
-void MenuConfig::Init() {
+void MenuConfig::Init(const ui::NativeTheme* theme) {
+ DCHECK_EQ(theme, ui::NativeThemeMac::instance());
font_list = gfx::FontList(gfx::Font([NSFont menuFontOfSize:0.0]));
menu_vertical_border_size = 4;
item_top_margin = item_no_icon_top_margin = 1;
@@ -28,4 +33,10 @@ void MenuConfig::Init() {
use_outer_border = false;
}
+// static
+const MenuConfig& MenuConfig::instance(const ui::NativeTheme* theme) {
+ CR_DEFINE_STATIC_LOCAL(MenuConfig, mac_instance, (theme));
+ return mac_instance;
+}
+
} // namespace views
« no previous file with comments | « ui/views/controls/menu/menu_config_linux.cc ('k') | ui/views/controls/menu/menu_config_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698