Make the account chooser and CVC dialog use the same icon with toolip for Views.

ui/views/bubble/info_bubble.cc

 // Copyright 2013 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/autofill/info_bubble.h"
+#include "ui/views/bubble/info_bubble.h"
 
 #include "base/i18n/rtl.h"

[msw, 2017/02/15 21:06:38]

nit: remove

[vasilii, 2017/02/16 14:28:06]

Done.

 #include "base/macros.h"

[msw, 2017/02/15 21:06:38]

nit: remove

[vasilii, 2017/02/16 14:28:06]

Done.

 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/text_constants.h"

[msw, 2017/02/15 21:06:38]

nit: remove?

[vasilii, 2017/02/16 14:28:06]

Done.

 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/combobox/combobox.h"

[msw, 2017/02/15 21:06:38]

nit: remove

[vasilii, 2017/02/16 14:28:06]

Done.

 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/layout_constants.h"

[msw, 2017/02/15 21:06:38]

nit: remove?

[vasilii, 2017/02/16 14:28:06]

Done.

 #include "ui/views/widget/widget.h"
 
-namespace autofill {
+namespace views {
 
 namespace {
 
 // The visible width of bubble borders (differs from the actual width) in px.
 const int kBubbleBorderVisibleWidth = 1;
 
 // The margin between the content of the error bubble and its border.
 const int kInfoBubbleHorizontalMargin = 14;
 const int kInfoBubbleVerticalMargin = 12;
 
+gfx::Insets GetPreferredInsets(const View* view) {

[msw, 2017/02/15 21:06:38]

nit: add a comment or inline in the one caller

[vasilii, 2017/02/16 14:28:06]

Acknowledged.

+  gfx::Size pref_size = view->GetPreferredSize();
+  gfx::Rect local_bounds = view->GetLocalBounds();
+  gfx::Point origin = local_bounds.CenterPoint();

[msw, 2017/02/15 21:06:38]

I'm confused by this function; what is it trying to do? Should this be
|gfx::Point origin = local_bounds.origin();|? (that seems to be the intent of
taking the center point and then moving it up and left by half the preferred
width...), and iirc, the local bounds' origin is always (0, 0), so this may be
entirely unnecessary? (or perhaps this is trying to get the origin of the image
within a view that might be sized larger than necessary? comments would help)

[vasilii, 2017/02/16 14:28:06]

Looks like the function does nothing. The insets are empty. I deleted the
function.

+  origin.Offset(-pref_size.width() / 2, -pref_size.height() / 2);
+  return gfx::Insets(origin.y(), origin.x(),
+                     local_bounds.bottom() - (origin.y() + pref_size.height()),
+                     local_bounds.right() - (origin.x() + pref_size.width()));
+}
+
 }  // namespace
 
-class InfoBubbleFrame : public views::BubbleFrameView {
+class InfoBubbleFrame : public BubbleFrameView {
  public:
   explicit InfoBubbleFrame(const gfx::Insets& content_margins)
-      : views::BubbleFrameView(gfx::Insets(), content_margins) {}
+      : BubbleFrameView(gfx::Insets(), content_margins) {}
   ~InfoBubbleFrame() override {}
 
   gfx::Rect GetAvailableScreenBounds(const gfx::Rect& rect) const override {
     return available_bounds_;
   }
 
   void set_available_bounds(const gfx::Rect& available_bounds) {
     available_bounds_ = available_bounds;
   }
 
  private:
   // Bounds that this frame should try to keep bubbles within (screen coords).
   gfx::Rect available_bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBubbleFrame);
 };
 
-InfoBubble::InfoBubble(views::View* anchor,
-                       const base::string16& message)
+InfoBubble::InfoBubble(View* anchor, const base::string16& message)
     : anchor_(anchor),
       frame_(NULL),
       align_to_anchor_edge_(false),
-      preferred_width_(233),
+      preferred_width_(0),
       show_above_anchor_(false) {
   DCHECK(anchor_);
   SetAnchorView(anchor_);
 
-  set_margins(gfx::Insets(kInfoBubbleVerticalMargin,
-                          kInfoBubbleHorizontalMargin,
-                          kInfoBubbleVerticalMargin,
-                          kInfoBubbleHorizontalMargin));
+  set_margins(
+      gfx::Insets(kInfoBubbleVerticalMargin, kInfoBubbleHorizontalMargin,

[msw, 2017/02/15 21:06:38]

nit: use two-arg ctor

[vasilii, 2017/02/16 14:28:06]

Done.

+                  kInfoBubbleVerticalMargin, kInfoBubbleHorizontalMargin));
   set_can_activate(false);
 
-  SetLayoutManager(new views::FillLayout);
-  views::Label* label = new views::Label(message);
+  SetLayoutManager(new FillLayout);
+  Label* label = new Label(message);
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   label->SetMultiLine(true);
   AddChildView(label);
 }
 
 InfoBubble::~InfoBubble() {}
 
 void InfoBubble::Show() {
   // TODO(dbeam): currently we assume that combobox menus always show downward

[msw, 2017/02/15 21:06:38]

nit: update if appropriate (not specific to combobox anymore)

[vasilii, 2017/02/16 14:28:06]

Done.

   // (which isn't true). If the invalid combobox is low enough on the screen,
   // its menu will actually show upward and obscure the bubble. Figure out when
   // this might happen and adjust |show_above_anchor_| accordingly. This is not
   // that big of deal because it rarely happens in practice.
   if (show_above_anchor_)
-    set_arrow(views::BubbleBorder::vertical_mirror(arrow()));
+    set_arrow(BubbleBorder::vertical_mirror(arrow()));
 
-  widget_ = views::BubbleDialogDelegateView::CreateBubble(this);
+  widget_ = BubbleDialogDelegateView::CreateBubble(this);
 
   if (align_to_anchor_edge_) {
     // The frame adjusts its arrow before the bubble's alignment can be changed.
     // Set the created bubble border back to the original arrow and re-adjust.
     frame_->bubble_border()->set_arrow(arrow());
-    SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
+    SetAlignment(BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
   }
 
   UpdatePosition();
 }
 
 void InfoBubble::Hide() {
-  views::Widget* widget = GetWidget();
+  Widget* widget = GetWidget();
   if (widget && !widget->IsClosed())
     widget->Close();
 }
 
 void InfoBubble::UpdatePosition() {
   if (!widget_)
     return;
 
   if (!anchor_->GetVisibleBounds().IsEmpty()) {
     SizeToContents();
     widget_->SetVisibilityChangedAnimationsEnabled(true);
     widget_->ShowInactive();
   } else {
     widget_->SetVisibilityChangedAnimationsEnabled(false);
     widget_->Hide();
   }
 }
 
-views::NonClientFrameView* InfoBubble::CreateNonClientFrameView(
-    views::Widget* widget) {
+NonClientFrameView* InfoBubble::CreateNonClientFrameView(Widget* widget) {
   DCHECK(!frame_);
   frame_ = new InfoBubbleFrame(margins());
   frame_->set_available_bounds(anchor_widget()->GetWindowBoundsInScreen());
-  frame_->SetBubbleBorder(std::unique_ptr<views::BubbleBorder>(
-      new views::BubbleBorder(arrow(), shadow(), color())));
+  frame_->SetBubbleBorder(std::unique_ptr<BubbleBorder>(
+      new BubbleBorder(arrow(), shadow(), color())));
   return frame_;
 }
 
 gfx::Size InfoBubble::GetPreferredSize() const {
+  if (!preferred_width_)

[msw, 2017/02/15 21:06:38]

nit: if |preferred_width_ <= 0| (or ==)

[vasilii, 2017/02/16 14:28:06]

Done.

+    return BubbleDialogDelegateView::GetPreferredSize();
+
   int pref_width = preferred_width_;
   pref_width -= frame_->GetInsets().width();
   pref_width -= 2 * kBubbleBorderVisibleWidth;
   return gfx::Size(pref_width, GetHeightForWidth(pref_width));
 }
 
-void InfoBubble::OnWidgetDestroyed(views::Widget* widget) {
+void InfoBubble::OnWidgetDestroyed(Widget* widget) {
   if (widget == widget_)
     widget_ = NULL;
 }
 
-void InfoBubble::OnWidgetBoundsChanged(views::Widget* widget,
+void InfoBubble::OnWidgetBoundsChanged(Widget* widget,
                                        const gfx::Rect& new_bounds) {
-  views::BubbleDialogDelegateView::OnWidgetBoundsChanged(widget, new_bounds);
+  BubbleDialogDelegateView::OnWidgetBoundsChanged(widget, new_bounds);
   if (anchor_widget() == widget)
     frame_->set_available_bounds(widget->GetWindowBoundsInScreen());
 }
 
 int InfoBubble::GetDialogButtons() const {
   return ui::DIALOG_BUTTON_NONE;
 }
 
-}  // namespace autofill
+gfx::Rect InfoBubble::GetAnchorRect() const {
+  gfx::Rect bounds = BubbleDialogDelegateView::GetAnchorRect();
+  bounds.Inset(GetPreferredInsets(anchor()));
+  return bounds;
+}
+
+}  // namespace views