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

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

Issue 2206693002: Improve settings override bubble to indicate policy installed extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 1 month 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 0611f3269d583a1a51f63197a16a0cf12b245a94..f8b9040573a5a39d186f3fcc262937ae5cd153e3 100644
--- a/chrome/browser/ui/extensions/extension_message_bubble_bridge.cc
+++ b/chrome/browser/ui/extensions/extension_message_bubble_bridge.cc
@@ -6,7 +6,14 @@
#include <utility>
+#include "base/memory/ptr_util.h"
#include "chrome/browser/extensions/extension_message_bubble_controller.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/grit/generated_resources.h"
+#include "components/grit/components_scaled_resources.h"
+#include "extensions/browser/extension_registry.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/vector_icons_public.h"
ExtensionMessageBubbleBridge::ExtensionMessageBubbleBridge(
std::unique_ptr<extensions::ExtensionMessageBubbleController> controller)
@@ -22,6 +29,12 @@ bool ExtensionMessageBubbleBridge::ShouldCloseOnDeactivate() {
return controller_->CloseOnDeactivate();
}
+bool ExtensionMessageBubbleBridge::IsPolicyIndicationNeeded(
+ const extensions::Extension* extension) {
+ return controller_->delegate()->SupportsPolicyIndicator() &&
+ extensions::Manifest::IsPolicyLocation(extension->location());
+}
+
base::string16 ExtensionMessageBubbleBridge::GetHeadingText() {
return controller_->delegate()->GetTitle();
}
@@ -37,6 +50,18 @@ base::string16 ExtensionMessageBubbleBridge::GetItemListText() {
}
base::string16 ExtensionMessageBubbleBridge::GetActionButtonText() {
+ const extensions::ExtensionIdList& list = controller_->GetExtensionIdList();
+ DCHECK(!list.empty());
+ const extensions::Extension* extension =
+ extensions::ExtensionRegistry::Get(controller_->profile())
+ ->enabled_extensions()
+ .GetByID(list[0]);
+
+ DCHECK(extension);
+ // An empty string is returned so that we don't display the button prompting
+ // to remove policy-installed extensions.
+ if (IsPolicyIndicationNeeded(extension))
+ return base::string16();
return controller_->delegate()->GetActionButtonLabel();
}
@@ -74,3 +99,30 @@ void ExtensionMessageBubbleBridge::OnBubbleClosed(CloseAction action) {
break;
}
}
+
+std::unique_ptr<ToolbarActionsBarBubbleDelegate::ExtraViewInfo>
+ExtensionMessageBubbleBridge::GetExtraViewInfo() {
+ const extensions::ExtensionIdList& list = controller_->GetExtensionIdList();
+ const extensions::Extension* extension =
+ extensions::ExtensionRegistry::Get(controller_->profile())
+ ->enabled_extensions()
+ .GetByID(list[0]);
+
+ DCHECK(extension);
+
+ std::unique_ptr<ExtraViewInfo> extra_view_info =
+ base::MakeUnique<ExtraViewInfo>();
+
+ if (IsPolicyIndicationNeeded(extension)) {
+ DCHECK_EQ(1u, list.size());
+ extra_view_info->resource_id = gfx::VectorIconId::BUSINESS;
+ extra_view_info->text =
+ l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSTALLED_BY_ADMIN);
+ extra_view_info->is_text_linked = false;
+ } else {
+ extra_view_info->text = controller_->delegate()->GetLearnMoreLabel();
+ extra_view_info->is_text_linked = true;
+ }
+
+ return extra_view_info;
+}

Powered by Google App Engine
This is Rietveld 408576698