| Index: ui/views/controls/menu/menu_config_aura.cc
|
| diff --git a/ui/views/controls/menu/menu_config_aura.cc b/ui/views/controls/menu/menu_config_aura.cc
|
| index 659b304782e597e013ab69093d01a48f89ad5897..a49d44744a6ce369d6ddfec4e646193a512a9713 100644
|
| --- a/ui/views/controls/menu/menu_config_aura.cc
|
| +++ b/ui/views/controls/menu/menu_config_aura.cc
|
| @@ -55,11 +55,9 @@ void MenuConfig::InitAura(const ui::NativeTheme* theme) {
|
| #if !defined(OS_WIN)
|
| // static
|
| const MenuConfig& MenuConfig::instance(const ui::NativeTheme* theme) {
|
| - static MenuConfig* views_instance = NULL;
|
| - if (!views_instance)
|
| - views_instance = new MenuConfig(theme ?
|
| - theme : ui::NativeTheme::instance());
|
| - return *views_instance;
|
| + CR_DEFINE_STATIC_LOCAL(MenuConfig, instance,
|
| + (theme ? theme : ui::NativeThemeAura::instance()));
|
| + return instance;
|
| }
|
| #endif
|
|
|
|
|