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

Unified Diff: chrome/browser/ui/extensions/extension_message_bubble_bridge.cc

Issue 2906723003: [Extenisons UI] Remove extension_action_redesign logic from the toolbar (Closed)
Patch Set: comments Created 3 years, 7 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/extensions/extension_message_bubble_bridge.cc
diff --git a/chrome/browser/ui/extensions/extension_message_bubble_bridge.cc b/chrome/browser/ui/extensions/extension_message_bubble_bridge.cc
index 32e335a8460486539262a87f1cea1a2b0e92b9bf..a60d365a5a42eeaf253874f6ee9ac73f9321053d 100644
--- a/chrome/browser/ui/extensions/extension_message_bubble_bridge.cc
+++ b/chrome/browser/ui/extensions/extension_message_bubble_bridge.cc
@@ -52,10 +52,13 @@ base::string16 ExtensionMessageBubbleBridge::GetItemListText() {
base::string16 ExtensionMessageBubbleBridge::GetActionButtonText() {
const extensions::ExtensionIdList& list = controller_->GetExtensionIdList();
DCHECK(!list.empty());
+ // Normally, the extension is enabled, but this might not be the case (such as
+ // for the SuspiciousExtensionBubbleDelegate, which warns the user about
+ // disabled extensions).
const extensions::Extension* extension =
extensions::ExtensionRegistry::Get(controller_->profile())
- ->enabled_extensions()
- .GetByID(list[0]);
+ ->GetExtensionById(list[0],
+ extensions::ExtensionRegistry::EVERYTHING);
DCHECK(extension);
// An empty string is returned so that we don't display the button prompting

Powered by Google App Engine
This is Rietveld 408576698