Improve settings override bubble to indicate policy installed extensions

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h"
 
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_bubble_delegate.h"
 #include "chrome/browser/ui/view_ids.h"
 #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"
 #include "ui/views/layout/layout_constants.h"
 
 namespace {
 const int kListPadding = 10;
 }
 
 ToolbarActionsBarBubbleViews::ToolbarActionsBarBubbleViews(
     views::View* anchor_view,
     std::unique_ptr<ToolbarActionsBarBubbleDelegate> delegate)
     : views::BubbleDialogDelegateView(anchor_view,
                                       views::BubbleBorder::TOP_RIGHT),
       delegate_(std::move(delegate)),
       item_list_(nullptr),
       learn_more_button_(nullptr) {
   set_close_on_deactivate(delegate_->ShouldCloseOnDeactivate());
 }
 
 ToolbarActionsBarBubbleViews::~ToolbarActionsBarBubbleViews() {}
 
 void ToolbarActionsBarBubbleViews::Show() {
   delegate_->OnBubbleShown();
   GetWidget()->Show();
 }
 
 views::View* ToolbarActionsBarBubbleViews::CreateExtraView() {
-  base::string16 text = delegate_->GetLearnMoreButtonText();
-  if (text.empty())
+  std::unique_ptr<ToolbarActionsBarBubbleDelegate::ExtraViewInfo>
+      extra_view_info = delegate_->GetExtraViewInfo();
+
+  base::string16 text = extra_view_info->text;
+
+  if (text.empty()) {
     return nullptr;

[Devlin, 2016/08/02 20:34:06]

What if we wanted to *just* show an icon, with no text?  We don't necessarily
need to support that yet, but it seems logical to allow.

[catmullings, 2016/08/13 00:35:52]

Done.

+  }
 
-  learn_more_button_ = new views::Link(text);
-  learn_more_button_->set_listener(this);
-  return learn_more_button_;
+  if (extra_view_info->is_clickable) {
+    views::Link* button = new views::Link(text);
+    button->set_listener(this);
+
+    // TODO: Should I expect the text to always be the learn_more_button_?
+    // If not, should I still instantiate the learn_more_button_?

[Devlin, 2016/08/02 20:34:06]

right now, it would be, and keeping it like this isn't terrible.  But I'd
probably recommend renaming this to be "link_" or something similar instead of
"learn_more_button_", which would alleviate the concern.

[catmullings, 2016/08/13 00:35:52]

Done.

+    learn_more_button_ = new views::Link(text);
+    learn_more_button_->set_listener(this);
+
+    return button;

[Devlin, 2016/08/02 20:34:06]

What about the case of a link + an icon?

[catmullings, 2016/08/13 00:35:52]

Done.

+  }
+
+  views::View* parent = new views::View();
+  views::ImageView* icon = extra_view_info->icon;
+  parent->AddChildView(icon);
+  views::Label* label = new views::Label(text);
+  parent->AddChildView(label);
+  return parent;
 }
 
 base::string16 ToolbarActionsBarBubbleViews::GetWindowTitle() const {
   return delegate_->GetHeadingText();
 }
 
 bool ToolbarActionsBarBubbleViews::Cancel() {
   delegate_->OnBubbleClosed(
       ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_USER_ACTION);
   return true;
@@ skipping 57 matching lines @@
                                         : delegate_->GetDismissButtonText();
 }
 
 void ToolbarActionsBarBubbleViews::LinkClicked(views::Link* link,
                                                int event_flags) {
   delegate_->OnBubbleClosed(ToolbarActionsBarBubbleDelegate::CLOSE_LEARN_MORE);
   // Reset delegate so we don't send extra OnBubbleClosed()s.
   delegate_.reset();
   GetWidget()->Close();
 }