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..efc36c425ddc04503cc74f01b96ba2d3cdbdeeb5 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)
@@ -37,7 +44,22 @@ base::string16 ExtensionMessageBubbleBridge::GetItemListText() {
 }
 
 base::string16 ExtensionMessageBubbleBridge::GetActionButtonText() {
-  return controller_->delegate()->GetActionButtonLabel();
+  const extensions::ExtensionIdList& list = controller_->GetExtensionIdList();

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

Lines 47 - 59 are obviously duplicated code from the GetExtraViewInfo() method
below. If this is the proper way and place to check whether to remove  the
"Restore Settings" button, then I will tuck this code into a helper function.
WDYT?

[Devlin, 2016/09/12 22:51:43]

Sounds reasonable to me, though note that you have a few stragglers here (e.g.
line 55)

[catmullings, 2016/09/22 00:00:10]

Done.

[catmullings, 2016/09/22 00:00:10]

Mkay. Line 55 should be the only straggler, since I need the list variable to
construct the extension variable, which is used to do the IsPolicyLocation()
check. 

+  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 (controller_->delegate()->SupportsPolicyIndicator() &&
+      extensions::Manifest::IsPolicyLocation(extension->location()))
+    return base::string16();

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

Initial attempt to remove the "Restore Settings" button if an extension is
policy installed. 

+  else
+    return controller_->delegate()->GetActionButtonLabel();
 }
 
 base::string16 ExtensionMessageBubbleBridge::GetDismissButtonText() {
@@ -74,3 +96,31 @@ 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 (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;
+}