| Index: ui/base/models/simple_menu_model.cc
|
| diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc
|
| index 6152766b3c5b548a8d9c6239bc29778aaca281f3..28c1b01c444d35d172d0d38be39f47c542c7d475 100644
|
| --- a/ui/base/models/simple_menu_model.cc
|
| +++ b/ui/base/models/simple_menu_model.cc
|
| @@ -54,6 +54,7 @@ void SimpleMenuModel::Delegate::MenuClosed() {
|
|
|
| SimpleMenuModel::SimpleMenuModel(Delegate* delegate)
|
| : delegate_(delegate),
|
| + menu_model_delegate_(NULL),
|
| ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
|
| }
|
|
|
| @@ -245,7 +246,7 @@ int SimpleMenuModel::GetGroupIdAt(int index) const {
|
| return items_.at(FlipIndex(index)).group_id;
|
| }
|
|
|
| -bool SimpleMenuModel::GetIconAt(int index, SkBitmap* icon) const {
|
| +bool SimpleMenuModel::GetIconAt(int index, SkBitmap* icon) {
|
| if (IsItemDynamicAt(index))
|
| return delegate_->GetIconForCommandId(GetCommandIdAt(index), icon);
|
|
|
| @@ -299,6 +300,11 @@ void SimpleMenuModel::MenuClosed() {
|
| method_factory_.NewRunnableMethod(&SimpleMenuModel::OnMenuClosed));
|
| }
|
|
|
| +void SimpleMenuModel::SetMenuModelDelegate(
|
| + ui::MenuModelDelegate* menu_model_delegate) {
|
| + menu_model_delegate_ = menu_model_delegate;
|
| +}
|
| +
|
| void SimpleMenuModel::OnMenuClosed() {
|
| if (delegate_)
|
| delegate_->MenuClosed();
|
|
|