Add notification mechanism when BrowserActionButton's icon has been updated.

ui/views/controls/menu/menu_item_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/menu/menu_item_view.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
@@ skipping 92 matching lines @@
       icon_view_(NULL),
       top_margin_(-1),
       bottom_margin_(-1),
       left_icon_margin_(0),
       right_icon_margin_(0),
       requested_menu_position_(POSITION_BEST_FIT),
       actual_menu_position_(requested_menu_position_),
       use_right_margin_(true) {
   // NOTE: don't check the delegate for NULL, UpdateMenuPartSizes() supplies a
   // NULL delegate.
+  // Note: This class also has a protected constructor and a common Init
+  // function to initialize both.

[Finnur, 2014/02/13 10:19:43]

I was hoping to see this comment on line 91 (above the constructor) because
other people are going to make the same mistake we did. Find the first
constructor in the file, add their variable to it and call it a day (totally
missing the other constructor).

   Init(NULL, 0, SUBMENU, delegate);
 }
 
 void MenuItemView::ChildPreferredSizeChanged(View* child) {
   invalidate_dimensions();
   PreferredSizeChanged();
 }
 
 bool MenuItemView::GetTooltipText(const gfx::Point& p,
                                   base::string16* tooltip) const {
@@ skipping 451 matching lines @@
       show_mnemonics_(false),
       has_icons_(false),
       icon_view_(NULL),
       top_margin_(-1),
       bottom_margin_(-1),
       left_icon_margin_(0),
       right_icon_margin_(0),
       requested_menu_position_(POSITION_BEST_FIT),
       actual_menu_position_(requested_menu_position_),
       use_right_margin_(true) {
+  // Note: This class also has a public constructor and a common Init function
+  // to initialize both.

[Finnur, 2014/02/13 10:19:43]

Same here, move to line 564.

   Init(parent, command, type, NULL);
 }
 
 MenuItemView::~MenuItemView() {
   delete submenu_;
   STLDeleteElements(&removed_items_);
+  if (lifecycle_observer_)
+    lifecycle_observer_->OnDeleted(this);
 }
 
 const char* MenuItemView::GetClassName() const {
   return kViewClassName;
 }
 
 // Calculates all sizes that we can from the OS.
 //
 // This is invoked prior to Running a menu.
 void MenuItemView::UpdateMenuPartSizes() {
@@ skipping 34 matching lines @@
   canceled_ = false;
   parent_menu_item_ = parent;
   type_ = type;
   selected_ = false;
   command_ = command;
   submenu_ = NULL;
   show_mnemonics_ = false;
   // 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.
   MenuDelegate* root_delegate = GetDelegate();
   if (parent && type != EMPTY && root_delegate)
     SetEnabled(root_delegate->IsCommandEnabled(command));
 }
 
 void MenuItemView::PrepareForRun(bool is_first_menu,
                                  bool has_mnemonics,
@@ skipping 406 matching lines @@
     } else {
       const Type& type = menu_item->GetType();
       if (type == CHECKBOX || type == RADIO)
         return true;
     }
   }
   return false;
 }
 
 }  // namespace views