[Extensions UI] Handle multiple warning bubbles racing to show

chrome/browser/extensions/extension_message_bubble_controller.cc

 // Copyright (c) 2013 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/extensions/extension_message_bubble_controller.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 82 matching lines @@
   acknowledged_pref_name_ = pref_name;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ExtensionMessageBubbleController
 
 ExtensionMessageBubbleController::ExtensionMessageBubbleController(
     Delegate* delegate,
     Browser* browser)
     : browser_(browser),
+      model_(ToolbarActionsModel::Get(browser_->profile())),
       user_action_(ACTION_BOUNDARY),
       delegate_(delegate),
       initialized_(false),
       did_highlight_(false),
+      is_active_bubble_(false),
       browser_list_observer_(this) {
   browser_list_observer_.Add(BrowserList::GetInstance());
 }
 
 ExtensionMessageBubbleController::~ExtensionMessageBubbleController() {
+  if (is_active_bubble_)
+    model_->set_has_active_bubble(false);
   if (did_highlight_)
-    ToolbarActionsModel::Get(profile())->StopHighlighting();
+    model_->StopHighlighting();
 }
 
 Profile* ExtensionMessageBubbleController::profile() {
   return browser_->profile();
 }
 
 bool ExtensionMessageBubbleController::ShouldShow() {
   std::set<Profile*>* profiles = GetProfileSet();
   return !profiles->count(profile()->GetOriginalProfile()) &&
+         (!model_->has_active_bubble() || is_active_bubble_) &&
          !GetExtensionList().empty();
 }
 
 std::vector<base::string16>
 ExtensionMessageBubbleController::GetExtensionList() {
   ExtensionIdList* list = GetOrCreateExtensionList();
   if (list->empty())
     return std::vector<base::string16>();
 
   ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
@@ skipping 30 matching lines @@
 
 const ExtensionIdList& ExtensionMessageBubbleController::GetExtensionIdList() {
   return *GetOrCreateExtensionList();
 }
 
 bool ExtensionMessageBubbleController::CloseOnDeactivate() {
   return delegate_->ShouldCloseOnDeactivate();
 }
 
 void ExtensionMessageBubbleController::HighlightExtensionsIfNecessary() {
+  DCHECK(is_active_bubble_);
   if (delegate_->ShouldHighlightExtensions() && !did_highlight_) {
     did_highlight_ = true;
     const ExtensionIdList& extension_ids = GetExtensionIdList();
     DCHECK(!extension_ids.empty());
-    ToolbarActionsModel::Get(profile())->HighlightActions(
-        extension_ids, ToolbarActionsModel::HIGHLIGHT_WARNING);
+    model_->HighlightActions(extension_ids,
+                             ToolbarActionsModel::HIGHLIGHT_WARNING);
   }
 }
 
 void ExtensionMessageBubbleController::OnShown() {
+  DCHECK(is_active_bubble_);
   GetProfileSet()->insert(profile()->GetOriginalProfile());
 }
 
 void ExtensionMessageBubbleController::OnBubbleAction() {
   DCHECK_EQ(ACTION_BOUNDARY, user_action_);
   user_action_ = ACTION_EXECUTE;
 
   delegate_->LogAction(ACTION_EXECUTE);
   delegate_->PerformAction(*GetOrCreateExtensionList());
 
@@ skipping 28 matching lines @@
     browser_->OpenURL(
         content::OpenURLParams(delegate_->GetLearnMoreUrl(),
                                content::Referrer(),
                                NEW_FOREGROUND_TAB,
                                ui::PAGE_TRANSITION_LINK,
                                false));
   }
   OnClose();
 }
 
+void ExtensionMessageBubbleController::SetIsActiveBubble() {
+  DCHECK(!is_active_bubble_);
+  DCHECK(!model_->has_active_bubble());
+  is_active_bubble_ = true;
+  model_->set_has_active_bubble(true);
+}
+
 void ExtensionMessageBubbleController::ClearProfileListForTesting() {
   GetProfileSet()->clear();
 }
 
 // static
 void ExtensionMessageBubbleController::set_should_ignore_learn_more_for_testing(
     bool should_ignore) {
   g_should_ignore_learn_more_for_testing = should_ignore;
 }
 
 void ExtensionMessageBubbleController::OnBrowserRemoved(Browser* browser) {
-  if (browser == browser_ && did_highlight_) {
-    ToolbarActionsModel::Get(profile())->StopHighlighting();
-    did_highlight_ = false;
+  if (browser == browser_) {
+    if (did_highlight_) {
+      model_->StopHighlighting();
+      did_highlight_ = false;

[Finnur, 2016/06/20 10:39:00]

nit: The name of this variable is misleading. It *did* highlight, so setting it
to false looks a bit weird. 

is_highlighting_ is probably clearer, I suppose.

[Devlin, 2016/06/20 17:58:39]

Changed.

+    }
+    if (is_active_bubble_) {
+      model_->set_has_active_bubble(false);
+      is_active_bubble_ = false;
+    }
   }
 }
 
 void ExtensionMessageBubbleController::AcknowledgeExtensions() {
   ExtensionIdList* list = GetOrCreateExtensionList();
   for (ExtensionIdList::const_iterator it = list->begin();
        it != list->end(); ++it)
     delegate_->AcknowledgeExtension(*it, user_action_);
 }
 
@@ skipping 28 matching lines @@
     if (delegate_->ClearProfileSetAfterAction())
       GetProfileSet()->clear();
   }
 }
 
 std::set<Profile*>* ExtensionMessageBubbleController::GetProfileSet() {
   return &g_shown_for_profiles.Get()[delegate_->GetKey()];
 }
 
 }  // namespace extensions