| 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/menu_2.h" | 5 #include "views/controls/menu/menu_2.h" |
| 6 | 6 |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/logging.h" | |
| 9 #include "views/controls/menu/menu_wrapper.h" | 8 #include "views/controls/menu/menu_wrapper.h" |
| 10 | 9 |
| 11 namespace views { | 10 namespace views { |
| 12 | 11 |
| 13 Menu2::Menu2(menus::MenuModel* model) | 12 Menu2::Menu2(menus::MenuModel* model) |
| 14 : model_(model), | 13 : model_(model), |
| 15 ALLOW_THIS_IN_INITIALIZER_LIST( | 14 ALLOW_THIS_IN_INITIALIZER_LIST( |
| 16 wrapper_(MenuWrapper::CreateWrapper(this))) { | 15 wrapper_(MenuWrapper::CreateWrapper(this))) { |
| 17 Rebuild(); | 16 Rebuild(); |
| 18 } | 17 } |
| (...skipping 28 matching lines...) Expand all Loading... |
| 47 | 46 |
| 48 void Menu2::AddMenuListener(MenuListener* listener) { | 47 void Menu2::AddMenuListener(MenuListener* listener) { |
| 49 wrapper_->AddMenuListener(listener); | 48 wrapper_->AddMenuListener(listener); |
| 50 } | 49 } |
| 51 | 50 |
| 52 void Menu2::RemoveMenuListener(MenuListener* listener) { | 51 void Menu2::RemoveMenuListener(MenuListener* listener) { |
| 53 wrapper_->RemoveMenuListener(listener); | 52 wrapper_->RemoveMenuListener(listener); |
| 54 } | 53 } |
| 55 | 54 |
| 56 } // namespace | 55 } // namespace |
| OLD | NEW |