Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Unified Diff: chrome/browser/ui/toolbar/toolbar_actions_model.cc

Issue 2076093004: [Extensions UI] Handle multiple warning bubbles racing to show (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix win tests Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/toolbar/toolbar_actions_model.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model.cc b/chrome/browser/ui/toolbar/toolbar_actions_model.cc
index bae5b67c1d63177c66b78a040f2e8886bbb1cb80..7f2317370ad27c596cc182e0eef1334ae1ab6112 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_model.cc
+++ b/chrome/browser/ui/toolbar/toolbar_actions_model.cc
@@ -16,12 +16,14 @@
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/component_migration_helper.h"
#include "chrome/browser/extensions/extension_action_manager.h"
+#include "chrome/browser/extensions/extension_message_bubble_controller.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/extensions/extension_util.h"
#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/extensions/extension_action_view_controller.h"
+#include "chrome/browser/ui/extensions/extension_message_bubble_factory.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
#include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
@@ -52,9 +54,10 @@ ToolbarActionsModel::ToolbarActionsModel(
component_migration_helper_(
new extensions::ComponentMigrationHelper(profile_, this)),
actions_initialized_(false),
- use_redesign_(extensions::FeatureSwitch::extension_action_redesign()
- ->IsEnabled()),
+ use_redesign_(
+ extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()),
highlight_type_(HIGHLIGHT_NONE),
+ has_active_bubble_(false),
extension_action_observer_(this),
extension_registry_observer_(this),
weak_ptr_factory_(this) {
@@ -432,6 +435,17 @@ void ToolbarActionsModel::RemoveItem(const ToolbarItem& item) {
UpdatePrefs();
}
+std::unique_ptr<extensions::ExtensionMessageBubbleController>
+ToolbarActionsModel::GetExtensionMessageBubbleController(Browser* browser) {
+ std::unique_ptr<extensions::ExtensionMessageBubbleController> controller;
+ if (has_active_bubble())
+ return controller;
+ controller = ExtensionMessageBubbleFactory(browser).GetController();
+ if (controller)
+ controller->SetIsActiveBubble();
+ return controller;
+}
+
void ToolbarActionsModel::RemoveExtension(
const extensions::Extension* extension) {
RemoveItem(ToolbarItem(extension->id(), EXTENSION_ACTION));

Powered by Google App Engine
This is Rietveld 408576698