Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(676)

Unified Diff: ui/views/controls/menu/menu_item_view.cc

Issue 148143004: Add notification mechanism when BrowserActionButton's icon has been updated. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..42f41afdaab07fdf03044a6946ab7505e80a967e 100644
--- a/ui/views/controls/menu/menu_item_view.cc
+++ b/ui/views/controls/menu/menu_item_view.cc
@@ -88,6 +88,8 @@ int MenuItemView::pref_menu_height_;
// static
const char MenuItemView::kViewClassName[] = "MenuItemView";
+// Note: This class also has a protected constructor and a common Init function
+// to initialize both.
MenuItemView::MenuItemView(MenuDelegate* delegate)
: delegate_(delegate),
controller_(NULL),
@@ -559,6 +561,8 @@ const MenuConfig& MenuItemView::GetMenuConfig() const {
return MenuConfig::instance(NULL);
}
+// Note: This class also has a public constructor and a common Init function
+// to initialize both.
MenuItemView::MenuItemView(MenuItemView* parent,
int command,
MenuItemView::Type type)
@@ -587,6 +591,8 @@ MenuItemView::MenuItemView(MenuItemView* parent,
MenuItemView::~MenuItemView() {
delete submenu_;
STLDeleteElements(&removed_items_);
+ if (lifecycle_observer_)
+ lifecycle_observer_->OnDeleted(this);
}
const char* MenuItemView::GetClassName() const {
@@ -641,6 +647,7 @@ void MenuItemView::Init(MenuItemView* parent,
// Assign our ID, this allows SubmenuItemView to find MenuItemViews.
set_id(kMenuItemViewID);
has_icons_ = false;
+ lifecycle_observer_ = NULL;
// Don't request enabled status from the root menu item as it is just
// a container for real items. EMPTY items will be disabled.
« ui/views/controls/menu/menu_item_view.h ('K') | « ui/views/controls/menu/menu_item_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698