Improve settings override bubble to indicate policy installed extensions

chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc

Index: chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc b/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc
index 6ab2dacebf97ebdb3cae5f686afb1a08fbb9aa18..e5baa26a2a5653f5de00ab96cd8b33ae648384d7 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc
@@ -9,6 +9,7 @@
 #include "chrome/grit/locale_settings.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/label_button.h"
+#include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/layout/box_layout.h"
@@ -25,7 +26,7 @@ ToolbarActionsBarBubbleViews::ToolbarActionsBarBubbleViews(
                                       views::BubbleBorder::TOP_RIGHT),
       delegate_(std::move(delegate)),
       item_list_(nullptr),
-      learn_more_button_(nullptr) {
+      link_(nullptr) {
   set_close_on_deactivate(delegate_->ShouldCloseOnDeactivate());
 }
 
@@ -37,13 +38,41 @@ void ToolbarActionsBarBubbleViews::Show() {
 }
 
 views::View* ToolbarActionsBarBubbleViews::CreateExtraView() {
-  base::string16 text = delegate_->GetLearnMoreButtonText();
-  if (text.empty())
+  std::unique_ptr<ToolbarActionsBarBubbleDelegate::ExtraViewInfo>
+      extra_view_info = delegate_->GetExtraViewInfo();
+
+  if (!extra_view_info)
     return nullptr;
 
-  learn_more_button_ = new views::Link(text);
-  learn_more_button_->set_listener(this);
-  return learn_more_button_;
+  int resource_id = extra_view_info->resource_id;
+  views::ImageView* icon = nullptr;
+  if (resource_id != -1) {
+    icon = new views::ImageView();
+    icon->SetImage(
+        ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id));
+  }
+
+  views::Label* label = nullptr;

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

I replaced label_, the private variable, with a local variable named label. 
label_ is assigned somewhere before this method is called, which is a problem
for line 67 which checks if both views already exist.

This was causing a problem during a test when the parameter extra_view_info only
has the icon set, but this code would think that the label is set as well. 

+  const base::string16& text = extra_view_info->text;
+  if (!text.empty()) {
+    if (extra_view_info->is_text_linked) {
+      views::Link* link = new views::Link(text);
+      link->set_listener(this);
+      label = link;
+    } else {
+      label = new views::Label(text);
+    }
+  }
+
+  if (icon && label) {
+    views::View* parent = new views::View();
+    parent->AddChildView(icon);
+    parent->AddChildView(label);
+    return parent;
+  }
+
+  return icon ? static_cast<views::View*>(icon)
+              : static_cast<views::View*>(label);
 }
 
 base::string16 ToolbarActionsBarBubbleViews::GetWindowTitle() const {