| 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 a961b68320fae3faf135ac86a02663e2c686d100..78d6a2cc7f5fc7bdfd9e0351403c68026a5f1c7f 100644
|
| --- a/ui/views/controls/menu/menu_config_mac.mm
|
| +++ b/ui/views/controls/menu/menu_config_mac.mm
|
| @@ -13,6 +13,7 @@
|
| namespace views {
|
|
|
| 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;
|
| @@ -34,8 +35,7 @@ void MenuConfig::Init(const ui::NativeTheme* theme) {
|
|
|
| // static
|
| const MenuConfig& MenuConfig::instance(const ui::NativeTheme* theme) {
|
| - CR_DEFINE_STATIC_LOCAL(MenuConfig, mac_instance,
|
| - (theme ? theme : ui::NativeTheme::instance()));
|
| + CR_DEFINE_STATIC_LOCAL(MenuConfig, mac_instance, (theme));
|
| return mac_instance;
|
| }
|
|
|
|
|