| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/views/controls/menu/menu_config.h" | 5 #include "ui/views/controls/menu/menu_config.h" |
| 6 | 6 |
| 7 #include "ui/base/layout.h" | 7 #include "ui/base/layout.h" |
| 8 #include "ui/base/resource/resource_bundle.h" | 8 #include "ui/base/resource/resource_bundle.h" |
| 9 #include "ui/gfx/image/image.h" | 9 #include "ui/gfx/image/image.h" |
| 10 #include "ui/gfx/image/image_skia.h" | 10 #include "ui/gfx/image/image_skia.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 offset_context_menus = true; | 48 offset_context_menus = true; |
| 49 corner_radius = kMenuCornerRadiusForAura; | 49 corner_radius = kMenuCornerRadiusForAura; |
| 50 | 50 |
| 51 // In Ash, the border is provided by the shadow. | 51 // In Ash, the border is provided by the shadow. |
| 52 use_outer_border = false; | 52 use_outer_border = false; |
| 53 } | 53 } |
| 54 | 54 |
| 55 #if !defined(OS_WIN) | 55 #if !defined(OS_WIN) |
| 56 // static | 56 // static |
| 57 const MenuConfig& MenuConfig::instance(const ui::NativeTheme* theme) { | 57 const MenuConfig& MenuConfig::instance(const ui::NativeTheme* theme) { |
| 58 static MenuConfig* views_instance = NULL; | 58 CR_DEFINE_STATIC_LOCAL(MenuConfig, instance, |
| 59 if (!views_instance) | 59 (theme ? theme : ui::NativeThemeAura::instance())); |
| 60 views_instance = new MenuConfig(theme ? | 60 return instance; |
| 61 theme : ui::NativeTheme::instance()); | |
| 62 return *views_instance; | |
| 63 } | 61 } |
| 64 #endif | 62 #endif |
| 65 | 63 |
| 66 } // namespace views | 64 } // namespace views |
| OLD | NEW |