Cater for the "double close" when clicking "Learn More" on auto-dismiss extension bubbles.

chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc

 // Copyright 2016 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 "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h"
 
 #include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/grit/locale_settings.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/layout/box_layout.h"
 
 namespace {
 const int kIconSize = 16;
 }
 
 ToolbarActionsBarBubbleViews::ToolbarActionsBarBubbleViews(
     views::View* anchor_view,
     const gfx::Point& anchor_point,
     bool anchored_to_action,
     std::unique_ptr<ToolbarActionsBarBubbleDelegate> delegate)
     : views::BubbleDialogDelegateView(anchor_view,
                                       views::BubbleBorder::TOP_RIGHT),
       delegate_(std::move(delegate)),
-      close_reason_(
-          ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_DEACTIVATION),
+      delegate_notified_of_close_(false),
       item_list_(nullptr),
       link_(nullptr),
       anchored_to_action_(anchored_to_action) {
   set_close_on_deactivate(delegate_->ShouldCloseOnDeactivate());
   if (!anchor_view)
     SetAnchorRect(gfx::Rect(anchor_point, gfx::Size()));
 }
 
 ToolbarActionsBarBubbleViews::~ToolbarActionsBarBubbleViews() {}
 
@@ skipping 41 matching lines @@
 
   return icon ? static_cast<views::View*>(icon.release())
               : static_cast<views::View*>(label.release());
 }
 
 base::string16 ToolbarActionsBarBubbleViews::GetWindowTitle() const {
   return delegate_->GetHeadingText();
 }
 
 bool ToolbarActionsBarBubbleViews::Cancel() {
+  DCHECK(!delegate_notified_of_close_);
+  delegate_notified_of_close_ = true;
   delegate_->OnBubbleClosed(
       ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_USER_ACTION);
   return true;
 }
 
 bool ToolbarActionsBarBubbleViews::Accept() {
+  DCHECK(!delegate_notified_of_close_);
+  delegate_notified_of_close_ = true;
   delegate_->OnBubbleClosed(ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE);
   return true;
 }
 
 bool ToolbarActionsBarBubbleViews::Close() {
-  delegate_->OnBubbleClosed(close_reason_);
+  // If the user took any action, the delegate will have been notified already.
+  // Otherwise, this was dismissal due to deactivation.
+  if (!delegate_notified_of_close_) {
+    delegate_notified_of_close_ = true;
+    delegate_->OnBubbleClosed(
+        ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_DEACTIVATION);
+  }
   return true;
 }
 
 void ToolbarActionsBarBubbleViews::Init() {
   ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
   SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kVertical, 0, 0,
       provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_VERTICAL)));
 
   // Add the content string.
@@ skipping 37 matching lines @@
 }
 
 base::string16 ToolbarActionsBarBubbleViews::GetDialogButtonLabel(
     ui::DialogButton button) const {
   return button == ui::DIALOG_BUTTON_OK ? delegate_->GetActionButtonText()
                                         : delegate_->GetDismissButtonText();
 }
 
 void ToolbarActionsBarBubbleViews::LinkClicked(views::Link* link,
                                                int event_flags) {
-  close_reason_ = ToolbarActionsBarBubbleDelegate::CLOSE_LEARN_MORE;
+  DCHECK(!delegate_notified_of_close_);
+  delegate_notified_of_close_ = true;
+  delegate_->OnBubbleClosed(ToolbarActionsBarBubbleDelegate::CLOSE_LEARN_MORE);
+  // Note that the Widget may or may not already be closed at this point,
+  // depending on delegate_->ShouldCloseOnDeactivate(). Widget::Close() protects
+  // against multiple calls (so long as they are not nested), and Widget
+  // destruction is asynchronous, so it is safe to call Close() again.
   GetWidget()->Close();
 }