| 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 "grit/ui_resources.h" | |
| 8 #include "ui/base/resource/resource_bundle.h" | |
| 9 #include "ui/gfx/image/image_skia.h" | 7 #include "ui/gfx/image/image_skia.h" |
| 10 #include "ui/native_theme/native_theme_mac.h" | 8 #include "ui/native_theme/native_theme_mac.h" |
| 11 #include "ui/views/controls/menu/menu_image_util.h" | 9 #include "ui/views/controls/menu/menu_image_util.h" |
| 12 | 10 |
| 13 namespace views { | 11 namespace views { |
| 14 | 12 |
| 15 void MenuConfig::Init(const ui::NativeTheme* theme) { | 13 void MenuConfig::Init(const ui::NativeTheme* theme) { |
| 16 NOTIMPLEMENTED(); | 14 NOTIMPLEMENTED(); |
| 17 } | 15 } |
| 18 | 16 |
| 19 // static | 17 // static |
| 20 const MenuConfig& MenuConfig::instance(const ui::NativeTheme* theme) { | 18 const MenuConfig& MenuConfig::instance(const ui::NativeTheme* theme) { |
| 21 CR_DEFINE_STATIC_LOCAL( | 19 CR_DEFINE_STATIC_LOCAL( |
| 22 MenuConfig, mac_instance, (theme ? theme : ui::NativeTheme::instance())); | 20 MenuConfig, mac_instance, (theme ? theme : ui::NativeTheme::instance())); |
| 23 return mac_instance; | 21 return mac_instance; |
| 24 } | 22 } |
| 25 | 23 |
| 26 } // namespace views | 24 } // namespace views |
| OLD | NEW |