Chromium Code Reviews| Index: ui/views/controls/menu/menu_item_view.cc |
| diff --git a/ui/views/controls/menu/menu_item_view.cc b/ui/views/controls/menu/menu_item_view.cc |
| index 15e7db39e64f632c32e0b4c4dd29f646515b5a0f..30162d19cb438c284c45b05c30d3db215aa37ac9 100644 |
| --- a/ui/views/controls/menu/menu_item_view.cc |
| +++ b/ui/views/controls/menu/menu_item_view.cc |
| @@ -587,6 +587,9 @@ MenuItemView::MenuItemView(MenuItemView* parent, |
| MenuItemView::~MenuItemView() { |
| delete submenu_; |
| STLDeleteElements(&removed_items_); |
| + if (lifecycle_observer_) { |
| + lifecycle_observer_->OnDeleted(this); |
| + } |
|
Finnur
2014/02/10 10:41:41
nit: When the body of an if clause is only 1 line
|
| } |
| const char* MenuItemView::GetClassName() const { |
| @@ -641,6 +644,7 @@ void MenuItemView::Init(MenuItemView* parent, |
| // Assign our ID, this allows SubmenuItemView to find MenuItemViews. |
| set_id(kMenuItemViewID); |
| has_icons_ = false; |
| + lifecycle_observer_ = NULL; |
|
Finnur
2014/02/10 10:41:41
Looks like the convention in this class is to null
Finnur
2014/02/12 11:19:52
Hmmm... Now that I look at this again I realize th
|
| // Don't request enabled status from the root menu item as it is just |
| // a container for real items. EMPTY items will be disabled. |