Always Close the Autofill UI through the same path

chrome/browser/ui/views/autofill/autofill_popup_view_views.cc

 // Copyright (c) 2012 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/autofill_popup_view_views.h"
 
 #include "chrome/browser/ui/autofill/autofill_popup_controller.h"
 #include "grit/ui_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "ui/base/keycodes/keyboard_codes.h"
@@ skipping 16 matching lines @@
 const SkColor kValueTextColor = SkColorSetARGB(0xFF, 0x00, 0x00, 0x00);
 
 }  // namespace
 
 AutofillPopupViewViews::AutofillPopupViewViews(
     AutofillPopupController* controller)
     : controller_(controller),
       observing_widget_(NULL) {}
 
 AutofillPopupViewViews::~AutofillPopupViewViews() {
+}
+
+void AutofillPopupViewViews::Hide() {
+  AutofillPopupView::Hide();
+
   if (observing_widget_)
     observing_widget_->RemoveObserver(this);
 
-  controller_->ViewDestroyed();
-}
+  // The controller is no longer valid after it hides us.
+  controller_ = NULL;
 
-void AutofillPopupViewViews::Hide() {
   if (GetWidget()) {
     // This deletes |this|.
     GetWidget()->Close();
   } else {
     delete this;
   }
 }
 
 void AutofillPopupViewViews::OnPaint(gfx::Canvas* canvas) {
+  // This can happen if we have a paint message in the queue when the popup
+  // is told to hide (so the controller is invalid at this point). Its ok to
+  // avoid drawing popup, sine we don't have access to the data anymore, and it
+  // should be hidden soon.
+  if (!controller_)
+    return;
+
   canvas->DrawColor(kPopupBackground);
   OnPaintBorder(canvas);
 
   for (size_t i = 0; i < controller_->names().size(); ++i) {
     gfx::Rect line_rect = controller_->GetRowBounds(i);
 
     if (controller_->identifiers()[i] ==
             WebAutofillClient::MenuItemIDSeparator) {
       canvas->DrawRect(line_rect, kItemTextColor);
     } else {
@@ skipping 36 matching lines @@
 void AutofillPopupViewViews::OnMouseReleased(const ui::MouseEvent& event) {
   // We only care about the left click.
   if (event.IsOnlyLeftMouseButton() &&
       HitTestPoint(gfx::Point(event.x(), event.y())))
     controller_->MouseClicked(event.x(), event.y());
 }
 
 void AutofillPopupViewViews::OnWidgetBoundsChanged(
     views::Widget* widget,
     const gfx::Rect& new_bounds) {
-  Hide();
+  controller_->Hide();
 }
 
 void AutofillPopupViewViews::Show() {
   if (!GetWidget()) {
     // The widget is destroyed by the corresponding NativeWidget, so we use
     // a weak pointer to hold the reference and don't have to worry about
     // deletion.
     views::Widget* widget = new views::Widget;
     views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
     params.delegate = this;
@@ skipping 83 matching lines @@
       canvas->GetStringWidth(controller_->subtexts()[index],
                              controller_->subtext_font()),
       entry_rect.height(),
       gfx::Canvas::TEXT_ALIGN_CENTER);
 }
 
 AutofillPopupView* AutofillPopupView::Create(
     AutofillPopupController* controller) {
   return new AutofillPopupViewViews(controller);
 }