Revert 151148 - breaks browsertests on Windows. Didn't go through trybots or CQ.

Fixed Issue 141873. Crash when BrowserActionButton get disabled or hidden.

BUG=141873
TEST=Try to disable or hide extension buttons, should not crash.

Review URL: https://chromiumcodereview.appspot.com/10834275

TBR=yefim@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151154 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/views/browser_action_view.cc

@@ -59,15 +59,9 @@ BrowserActionView::BrowserActionView(const Extension* extension,
       delegate_(delegate),
       button_(NULL),
       extension_(extension) {
-  button_ = new BrowserActionButton(extension_, browser_, delegate_);
-  button_->set_drag_controller(delegate_);
-  AddChildView(button_);
-  button_->UpdateState();
 }
 
 BrowserActionView::~BrowserActionView() {
-  RemoveChildView(button_);
-  button_->Destroy();
 }
 
 gfx::Canvas* BrowserActionView::GetIconWithBadge() {
@@ -102,6 +96,18 @@ void BrowserActionView::Layout() {
                      BrowserActionsContainer::IconHeight());
 }
 
+void BrowserActionView::ViewHierarchyChanged(bool is_add,
+                                             View* parent,
+                                             View* child) {
+  if (is_add && (child == this)) {
+    button_ = new BrowserActionButton(extension_, browser_, delegate_);
+    button_->set_drag_controller(delegate_);
+
+    AddChildView(button_);
+    button_->UpdateState();
+  }
+}
+
 void BrowserActionView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->name = l10n_util::GetStringUTF16(
       IDS_ACCNAME_EXTENSIONS_BROWSER_ACTION);
@@ -225,6 +231,7 @@ void BrowserActionButton::ShowContextMenuForView(View* source,
     return;
   }
 
+  menu_runner_.reset();
   SetButtonNotPushed();
   context_menu_ = NULL;
 }

chrome/browser/ui/views/browser_action_view.h

@@ -77,6 +77,9 @@ class BrowserActionView : public views::View {
  protected:
   // Overridden from views::View to paint the badge on top of children.
   virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE;
+  virtual void ViewHierarchyChanged(bool is_add,
+                                    View* parent,
+                                    View* child) OVERRIDE;
 
  private:
   // The Browser object this view is associated with.