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),

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

In the ExtraViewInfo struct, if the text is not meant to be a link
(!is_text_linked) and just a regular views::Label, can I use this private
member? The method item_list() (defined in the .h) is only used in test files. 

[Devlin, 2016/08/22 20:59:42]

We shouldn't.  Links have extra behavior, and you can't assign a Label to a
Link.

[catmullings, 2016/08/31 00:03:31]

Done.

-      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();
+
+  base::string16 text = extra_view_info->text;

[Devlin, 2016/08/22 20:59:42]

we need to check if extra_view_info is null, right?

[Devlin, 2016/08/22 20:59:42]

Let's also avoid the copy of the base::string16.

[catmullings, 2016/08/31 00:03:30]

Done.

[catmullings, 2016/08/31 00:03:30]

Done.

+  int resource_id = extra_view_info->resource_id;
+
+  if (text.empty() && resource_id != -1) {

[Devlin, 2016/08/22 20:59:42]

Why do we return if resource_id != -1?

[catmullings, 2016/08/31 00:03:30]

Should be == .

Done.

     return nullptr;
+  }
 
-  learn_more_button_ = new views::Link(text);
-  learn_more_button_->set_listener(this);
-  return learn_more_button_;
+  views::View* parent = nullptr;
+
+  if (resource_id != -1 && !text.empty()) {
+    parent = new views::View();
+  }
+
+  if (resource_id != -1) {
+    views::ImageView* icon = new views::ImageView();
+    icon->SetImage(
+        ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id));
+    if (text.empty()) {

[Devlin, 2016/08/22 20:59:42]

it looks like there's a lot of duplicate checking here for text.empty() and
resource_id [!,=]= -1, and the many different returns from various branches also
make it a bit confusing.  Can we clean it up a bit to make it more readable?

[catmullings, 2016/08/31 00:03:31]

Will followup with you about this offline. 

[catmullings, 2016/09/06 19:16:23]

What do you think of this change?

+      return icon;
+    } else {
+      parent->AddChildView(icon);
+    }
+  }
+
+  if (!text.empty()) {
+    if (extra_view_info->is_text_linked) {
+      link_ = new views::Link(text);
+      link_->set_listener(this);
+      if (resource_id == -1) {
+        return link_;
+      } else {
+        parent->AddChildView(link_);
+      }
+    } else {
+      views::Label* label = new views::Label(text);
+      if (resource_id == -1) {
+        return label;
+      } else {
+        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();
 }