Improve settings override bubble to indicate policy installed extensions

chrome/browser/ui/extensions/extension_message_bubble_bridge.cc

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..8d0e937fcd3d7c57d8a362904fd29ce7dd6bb2a8 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/base/resource/resource_bundle.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,15 @@ base::string16 ExtensionMessageBubbleBridge::GetItemListText() {
 }
 
 base::string16 ExtensionMessageBubbleBridge::GetActionButtonText() {
+  const extensions::ExtensionIdList& list = controller_->GetExtensionIdList();

[Devlin, 2016/10/12 20:16:54]

maybe add a DCHECK(!list.empty()) here?

[catmullings, 2016/10/14 23:16:46]

Done.

+  const extensions::Extension* extension =
+      extensions::ExtensionRegistry::Get(controller_->profile())
+          ->enabled_extensions()
+          .GetByID(list[0]);
+
+  DCHECK(extension);
+  if (IsPolicyIndicationNeeded(extension))
+    return base::string16();

[Devlin, 2016/10/12 20:16:54]

Add a comment like:  // Don't prompt to remove policy-installed extensions.

[catmullings, 2016/10/14 23:16:46]

I added a slightly longer comment. Lmk if it's verbose. 

[catmullings, 2016/10/14 23:16:46]

Done.

   return controller_->delegate()->GetActionButtonLabel();
 }
 
@@ -69,8 +91,35 @@ void ExtensionMessageBubbleBridge::OnBubbleClosed(CloseAction action) {
     case CLOSE_EXECUTE:
       controller_->OnBubbleAction();
       break;
-    case CLOSE_LEARN_MORE:
+    case CLOSE_LINK:
       controller_->OnLinkClicked();
       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 = IDR_OMNIBOX_HTTPS_POLICY_WARNING;
+    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;
+}