Implement learn more bubble on views.

chrome/browser/ui/views/autofill/decorated_textfield.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/decorated_textfield.h"
 
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
-#include "chrome/browser/ui/views/autofill/tooltip_icon.h"
+#include "chrome/browser/ui/views/autofill/learn_more_icon.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/focusable_border.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 
 namespace {
 
 // Padding around icons inside DecoratedTextfields.
 const int kTextfieldIconPadding = 3;
@@ skipping 68 matching lines @@
   if (!icon.IsEmpty()) {
     icon_view_.reset(new views::ImageView());
     icon_view_->set_owned_by_client();
     icon_view_->SetImage(icon.ToImageSkia());
     AddChildView(icon_view_.get());
   }
 
   IconChanged();
 }
 
-void DecoratedTextfield::SetTooltipIcon(const base::string16& text) {
+void DecoratedTextfield::SetLearnMoreIcon(
+    const base::string16& text,
+    const base::WeakPtr<LearnMoreIconDelegate>& delegate) {
   if (!icon_view_ && text.empty())
     return;
 
   if (icon_view_)
     RemoveChildView(icon_view_.get());
 
   if (!text.empty()) {
-    icon_view_.reset(new TooltipIcon(text));
+    icon_view_.reset(new LearnMoreIcon(text, delegate));
     AddChildView(icon_view_.get());
   }
 
   IconChanged();
 }
 
 base::string16 DecoratedTextfield::GetPlaceholderText() const {
   if (!editable_)
     return base::string16();
 
   return views::Textfield::GetPlaceholderText();
 }
 
 const char* DecoratedTextfield::GetClassName() const {
   return kViewClassName;
 }
 
 views::View* DecoratedTextfield::GetEventHandlerForPoint(
     const gfx::Point& point) {
-  return native_wrapper_->GetView();
+  if (icon_view_ && icon_view_->GetClassName() != LearnMoreIcon::kViewClassName)
+    return native_wrapper_->GetView();
+  return views::Textfield::GetEventHandlerForPoint(point);

[Evan Stade, 2013/11/05 02:01:40]

I'd write this as:

views::View* handler = views::Textfield::GetEventHandlerForPoint(point);
if (handler classname is LearnMoreIcon)
  return handler;

return native_wrapper_->GetView();

[Dan Beam, 2013/11/05 07:00:55]

Done.

 }
 
 void DecoratedTextfield::OnFocus() {
   border_->set_has_focus(true);
   views::Textfield::OnFocus();
 }
 
 void DecoratedTextfield::OnBlur() {
   border_->set_has_focus(false);
   views::Textfield::OnBlur();
@@ skipping 27 matching lines @@
 
 void DecoratedTextfield::UpdateBackground() {
   set_background(
       views::Background::CreateSolidBackground(GetBackgroundColor()));
 }
 
 void DecoratedTextfield::IconChanged() {
   // Don't show the icon if nothing else is showing.
   icon_view_->SetVisible(editable_ || !text().empty());
 
+  if (!icon_view_->visible())
+    icon_view_->SetSize(gfx::Size());

[Evan Stade, 2013/11/05 02:01:40]

why necessary?

[Dan Beam, 2013/11/05 07:00:55]

not

+
   int icon_space = icon_view_ ?
       icon_view_->GetPreferredSize().width() + 2 * kTextfieldIconPadding : 0;
 
   bool is_rtl = base::i18n::IsRTL();
   SetHorizontalMargins(is_rtl ? icon_space : 0, is_rtl ? 0 : icon_space);
 
   Layout();
   SchedulePaint();
 }
 
 } // namespace autofill