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..b7172281ac4bc4b40506fcff1e112343bfaa4120 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)
@@ -74,3 +81,32 @@ void ExtensionMessageBubbleBridge::OnBubbleClosed(CloseAction action) {
       break;
   }
 }
+
+std::unique_ptr<ToolbarActionsBarBubbleDelegate::ExtraViewInfo>
+ExtensionMessageBubbleBridge::GetExtraViewInfo() {
+  const extensions::ExtensionIdList& list = controller_->GetExtensionIdList();

[Devlin, 2016/09/07 18:37:49]

Let's move list and extension into the block where use use them so we don't do
any extra work in other cases.

[catmullings, 2016/09/08 15:42:29]

The list variable is used to construct the following extension variable, so it
can't go inside the if-block below.

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

[Devlin, 2016/09/07 18:37:49]

I think we can DCHECK this in the block where we use it.

[catmullings, 2016/09/08 15:42:29]

Converted this to a DCHECK.
However, I can't quite tuck this into the if-block below b/c the extension
variable is used to perform the check. Thoughts?

Also, how do you know that we should enforce a DCHECK instead of return nullptr?

+    return nullptr;
+
+  std::unique_ptr<ExtraViewInfo> extra_view_info =
+      base::MakeUnique<ExtraViewInfo>();
+
+  if (controller_->delegate()->SupportsPolicyIndicator() &&
+      extensions::Manifest::IsPolicyLocation(extension->location())) {
+    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;
+}