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 52 matching lines @@
       ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_USER_ACTION);
   return true;
 }
 
 bool ToolbarActionsBarBubbleViews::Accept() {
   delegate_->OnBubbleClosed(ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE);
   return true;
 }
 
 bool ToolbarActionsBarBubbleViews::Close() {
-  delegate_->OnBubbleClosed(close_reason_);
+  // If delegate_->OnBubbleClosed() was called by LinkClicked(), the bubble may

[Devlin, 2017/04/20 16:12:15]

We could make this a little less corner-casey (and perhaps more resilient) by
adding delegate_notified_of_close_ = true in Cancel() and Accept().  Then this
basically becomes:
// If the user took any action, the delegate will have been notified already.
Otherwise, this was dismissal due to deactivation.

That way, we also don't need to trail around the logic of Close() being called
sync or async from various actions, being called in the case of some closes but
not others, etc.

[tapted, 2017/04/21 00:24:33]

Done.

+  // close automatically in response to the delegate action (e.g. losing focus
+  // when a tab is opened).
+  if (!delegate_notified_of_close_) {
+    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;
+  delegate_notified_of_close_ = true;
+  // Force the delegate action to happen here rather than in Close(). Close() is

[Devlin, 2017/04/20 16:12:15]

Similarly here, we could just have this be the norm (since we already do it in
Cancel() and Accept())

[tapted, 2017/04/21 00:24:33]

Done.

+  // called from Widget::CanClose() so attempting to open a link there can cause
+  // recursion.
+  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();
 }