| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "views/controls/menu/native_menu_x.h" | 5 #include "views/controls/menu/native_menu_x.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "gfx/canvas_skia.h" | 9 #include "ui/gfx/canvas_skia.h" |
| 10 #include "gfx/skia_util.h" | 10 #include "ui/gfx/skia_util.h" |
| 11 #include "views/controls/menu/menu_2.h" | 11 #include "views/controls/menu/menu_2.h" |
| 12 #include "views/controls/menu/submenu_view.h" | 12 #include "views/controls/menu/submenu_view.h" |
| 13 | 13 |
| 14 namespace views { | 14 namespace views { |
| 15 | 15 |
| 16 NativeMenuX::NativeMenuX(Menu2* menu) | 16 NativeMenuX::NativeMenuX(Menu2* menu) |
| 17 : model_(menu->model()), | 17 : model_(menu->model()), |
| 18 ALLOW_THIS_IN_INITIALIZER_LIST(root_(new MenuItemView(this))) { | 18 ALLOW_THIS_IN_INITIALIZER_LIST(root_(new MenuItemView(this))) { |
| 19 } | 19 } |
| 20 | 20 |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 } | 155 } |
| 156 | 156 |
| 157 // MenuWrapper, public: | 157 // MenuWrapper, public: |
| 158 | 158 |
| 159 // static | 159 // static |
| 160 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) { | 160 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) { |
| 161 return new NativeMenuX(menu); | 161 return new NativeMenuX(menu); |
| 162 } | 162 } |
| 163 | 163 |
| 164 } // namespace views | 164 } // namespace views |
| OLD | NEW |