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

chrome/browser/ui/views/passwords/credentials_item_view.cc

 // Copyright 2014 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/passwords/credentials_item_view.h"
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/autofill/core/common/password_form.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
-#include "ui/gfx/color_palette.h"
-#include "ui/gfx/image/image.h"
-#include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/path.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/views/border.h"
+#include "ui/views/bubble/tooltip_icon.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/layout_constants.h"
 
 namespace {
 // The default spacing between the icon and text.
 const int kSpacing = 12;
 
 gfx::Size GetTextLabelsSize(const views::Label* upper_label,
                             const views::Label* lower_label) {
@@ skipping 21 matching lines @@
   gfx::Rect bounds(GetImageBounds());
   gfx::Path circular_mask;
   circular_mask.addCircle(
       SkIntToScalar(bounds.x() + bounds.right()) / 2,
       SkIntToScalar(bounds.y() + bounds.bottom()) / 2,
       SkIntToScalar(std::min(bounds.height(), bounds.width())) / 2);
   canvas->ClipPath(circular_mask, true);
   ImageView::OnPaint(canvas);
 }
 
-// An ImageView that consumes the mouse events.
-class InfoImageView : public views::ImageView {
- public:
-  // View:
-  bool OnMousePressed(const ui::MouseEvent& event) override { return true; }
-  bool OnMouseDragged(const ui::MouseEvent& event) override { return true; }
-};
-
 }  // namespace
 
 CredentialsItemView::CredentialsItemView(
     views::ButtonListener* button_listener,
     const base::string16& upper_text,
     const base::string16& lower_text,
     SkColor hover_color,
     const autofill::PasswordForm* form,
     net::URLRequestContextGetter* request_context)
-    : LabelButton(button_listener, base::string16()),
+    : CustomButton(button_listener),
       form_(form),
       upper_label_(nullptr),
       lower_label_(nullptr),
       info_icon_(nullptr),
       hover_color_(hover_color),
       weak_ptr_factory_(this) {
   set_notify_enter_exit_on_child(true);
   // Create an image-view for the avatar. Make sure it ignores events so that
   // the parent can receive the events instead.
   image_view_ = new CircularImageView;
@@ skipping 21 matching lines @@
 
   if (!lower_text.empty()) {
     lower_label_ = new views::Label(
         lower_text, rb->GetFontList(ui::ResourceBundle::SmallFont));
     lower_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     lower_label_->SetMultiLine(true);
     AddChildView(lower_label_);
   }
 
   if (form_->is_public_suffix_match) {
-    info_icon_ = new InfoImageView;
-    info_icon_->SetImage(gfx::CreateVectorIcon(gfx::VectorIconId::INFO_OUTLINE,
-                                               kInfoIconSize,
-                                               gfx::kChromeIconGrey));
-    info_icon_->SetTooltipText(
+    info_icon_ = new views::TooltipIcon(
         base::UTF8ToUTF16(form_->origin.GetOrigin().spec()));
     AddChildView(info_icon_);
   }
 
   if (!upper_text.empty() && !lower_text.empty())
     SetAccessibleName(upper_text + base::ASCIIToUTF16("\n") + lower_text);
   else
     SetAccessibleName(upper_text + lower_text);
 
   SetFocusBehavior(FocusBehavior::ALWAYS);
@@ skipping 29 matching lines @@
   // Make the size at least as large as the minimum size needed by the border.
   size.SetToMax(border() ? border()->GetMinimumSize() : gfx::Size());
   return size;
 }
 
 int CredentialsItemView::GetHeightForWidth(int w) const {
   return View::GetHeightForWidth(w);
 }
 
 void CredentialsItemView::Layout() {
-  gfx::Rect child_area(GetChildAreaBounds());
+  gfx::Rect child_area(GetLocalBounds());
   child_area.Inset(GetInsets());
 
   gfx::Size image_size(image_view_->GetPreferredSize());
   image_size.SetToMin(child_area.size());
   gfx::Point image_origin(child_area.origin());
   image_origin.Offset(0, (child_area.height() - image_size.height()) / 2);
   image_view_->SetBoundsRect(gfx::Rect(image_origin, image_size));
 
   gfx::Size upper_size =
       upper_label_ ? upper_label_->GetPreferredSize() : gfx::Size();
@@ skipping 14 matching lines @@
     info_icon_->SetPosition(
         gfx::Point(child_area.right() - info_icon_->width(),
                    child_area.CenterPoint().y() - info_icon_->height() / 2));
   }
 }
 
 void CredentialsItemView::OnPaint(gfx::Canvas* canvas) {
   if (state() == STATE_PRESSED || state() == STATE_HOVERED)
     canvas->DrawColor(hover_color_);
 
-  LabelButton::OnPaint(canvas);
+  CustomButton::OnPaint(canvas);
 }
+
+void CredentialsItemView::NotifyClick(const ui::Event& event) {
+  if (info_icon_ == event.target())

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

nit: add a comment, eg. "Do not handle clicks on the tooltip info icon."

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

Removed because it doesn't work this way.

+    return;
+
+  CustomButton::NotifyClick(event);
+}