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/gfx/color_palette.h"
+#include "ui/gfx/paint_vector_icon.h"
+#include "ui/gfx/vector_icons_public.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) {
+      link_(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();
+
+  if (!extra_view_info)
     return nullptr;
 
-  learn_more_button_ = new views::Link(text);
-  learn_more_button_->set_listener(this);
-  return learn_more_button_;
+  gfx::VectorIconId resource_id = extra_view_info->resource_id;
+  views::ImageView* icon = nullptr;
+  if (resource_id != gfx::VectorIconId::VECTOR_ICON_NONE) {
+    icon = new views::ImageView();

[Devlin, 2016/10/20 17:04:07]

nit: I know this is all safe, but this method is long enough that we should
probably put this in unique_ptrs until we return them or add them as child
views, just so that if someone else comes along and puts an early return for
some reason at line 69, we don't leak.

[catmullings, 2016/10/21 03:49:29]

Done.

+    icon->SetImage(
+        gfx::CreateVectorIcon(resource_id, 16, gfx::kChromeIconGrey));
+  }
+
+  views::Label* label = nullptr;
+  const base::string16& text = extra_view_info->text;
+  if (!text.empty()) {
+    if (extra_view_info->is_text_linked) {
+      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->SetLayoutManager(
+        new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0,
+                             views::kRelatedControlVerticalSpacing));
+    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 {
   return delegate_->GetHeadingText();
 }
 
 bool ToolbarActionsBarBubbleViews::Cancel() {
   delegate_->OnBubbleClosed(
       ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_USER_ACTION);
   return true;
@@ skipping 32 matching lines @@
     item_list_->SetBorder(
         views::Border::CreateEmptyBorder(0, kListPadding, 0, 0));
     item_list_->SetMultiLine(true);
     item_list_->SizeToFit(width);
     item_list_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     AddChildView(item_list_);
   }
 }
 
 int ToolbarActionsBarBubbleViews::GetDialogButtons() const {
-  int buttons = ui::DIALOG_BUTTON_OK;
+  int buttons = ui::DIALOG_BUTTON_NONE;
+  if (!delegate_->GetActionButtonText().empty())
+    buttons |= ui::DIALOG_BUTTON_OK;
   if (!delegate_->GetDismissButtonText().empty())
     buttons |= ui::DIALOG_BUTTON_CANCEL;
   return buttons;
 }
 
 int ToolbarActionsBarBubbleViews::GetDefaultDialogButton() const {
   // TODO(estade): we should set a default where approprite. See
   // http://crbug.com/621122
   return ui::DIALOG_BUTTON_NONE;
 }
 
 base::string16 ToolbarActionsBarBubbleViews::GetDialogButtonLabel(
     ui::DialogButton button) const {
   return button == ui::DIALOG_BUTTON_OK ? delegate_->GetActionButtonText()
                                         : 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();
 }