Use WeakPtr to simplify AutofillPopupControllerImpl memory management

chrome/browser/ui/autofill/autofill_popup_controller_impl.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/autofill/autofill_popup_controller_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_popup_delegate.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "grit/webkit_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "ui/base/events/event.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/vector2d.h"
 
+using base::WeakPtr;
 using WebKit::WebAutofillClient;
 
 namespace {
 
 // Used to indicate that no line is currently selected by the user.
 const int kNoSelection = -1;
 
 // Size difference between name and subtext in pixels.
 const int kLabelFontSizeDelta = -2;
 
@@ skipping 30 matching lines @@
   { "genericCC", IDR_AUTOFILL_CC_GENERIC },
   { "jcbCC", IDR_AUTOFILL_CC_JCB },
   { "masterCardCC", IDR_AUTOFILL_CC_MASTERCARD },
   { "soloCC", IDR_AUTOFILL_CC_SOLO },
   { "visaCC", IDR_AUTOFILL_CC_VISA },
 };
 
 }  // end namespace
 
 // static
-AutofillPopupControllerImpl* AutofillPopupControllerImpl::GetOrCreate(
-    AutofillPopupControllerImpl* previous,
+WeakPtr<AutofillPopupControllerImpl> AutofillPopupControllerImpl::GetOrCreate(
+    WeakPtr<AutofillPopupControllerImpl> previous,
     AutofillPopupDelegate* delegate,
     gfx::NativeView container_view,
     const gfx::RectF& element_bounds) {
   DCHECK(!previous || previous->delegate_ == delegate);
 
   if (previous &&
       previous->container_view() == container_view &&
       previous->element_bounds() == element_bounds) {
     return previous;
   }
 
   if (previous)
     previous->Hide();
 
-  return new AutofillPopupControllerImpl(
-      delegate, container_view, element_bounds);
+  AutofillPopupControllerImpl* controller =
+      new AutofillPopupControllerImpl(delegate, container_view, element_bounds);
+  return controller->GetWeakPtr();
 }
 
 AutofillPopupControllerImpl::AutofillPopupControllerImpl(
     AutofillPopupDelegate* delegate,
     gfx::NativeView container_view,
     const gfx::RectF& element_bounds)
     : view_(NULL),
       delegate_(delegate),
       container_view_(container_view),
       element_bounds_(element_bounds),
       selected_line_(kNoSelection),
       delete_icon_hovered_(false),
       is_hiding_(false),
-      inform_delegate_of_destruction_(true) {
+      inform_delegate_of_destruction_(true),
+      weak_ptr_factory_(this) {
 #if !defined(OS_ANDROID)
   subtext_font_ = name_font_.DeriveFont(kLabelFontSizeDelta);
 #endif
 }
 
-AutofillPopupControllerImpl::~AutofillPopupControllerImpl() {
-  if (inform_delegate_of_destruction_)
-    delegate_->ControllerDestroyed();
-}
+AutofillPopupControllerImpl::~AutofillPopupControllerImpl() {}
 
 void AutofillPopupControllerImpl::Show(
     const std::vector<string16>& names,
     const std::vector<string16>& subtexts,
     const std::vector<string16>& icons,
     const std::vector<int>& identifiers) {
   names_ = names;
   full_names_ = names;
   subtexts_ = subtexts;
   icons_ = icons;
@@ skipping 33 matching lines @@
                                  ui::ELIDE_AT_END);
   }
 #endif
 
   if (!view_) {
     view_ = AutofillPopupView::Create(this);
     ShowView();
   } else {
     UpdateBoundsAndRedrawPopup();
   }
+
+  delegate_->OnPopupShown(this);
 }
 
 void AutofillPopupControllerImpl::Hide() {
   inform_delegate_of_destruction_ = false;
   HideInternal();
 }
 
 bool AutofillPopupControllerImpl::HandleKeyPressEvent(
     const content::NativeWebKeyboardEvent& event) {
   switch (event.windowsKeyCode) {
@@ skipping 148 matching lines @@
   return delete_icon_hovered_;
 }
 
 void AutofillPopupControllerImpl::HideInternal() {
   if (is_hiding_)
     return;
   is_hiding_ = true;
 
   SetSelectedLine(kNoSelection);
 
+  if (inform_delegate_of_destruction_)
+    delegate_->OnPopupHidden(this);
+
   if (view_)
     view_->Hide();
   else
     delete this;
 }
 
 void AutofillPopupControllerImpl::SetSelectedLine(int selected_line) {
   if (selected_line_ == selected_line)
     return;
 
@@ skipping 227 matching lines @@
   std::pair<int, int> popup_y_and_height = CalculatePopupYAndHeight(
       top_left_display, bottom_right_display, popup_height);
 
   popup_bounds_ = gfx::Rect(popup_x_and_width.first,
                             popup_y_and_height.first,
                             popup_x_and_width.second,
                             popup_y_and_height.second);
 }
 #endif  // !defined(OS_ANDROID)
 
+WeakPtr<AutofillPopupControllerImpl> AutofillPopupControllerImpl::GetWeakPtr() {
+  return weak_ptr_factory_.GetWeakPtr();
+}
+
 const gfx::Rect AutofillPopupControllerImpl::RoundedElementBounds() const {
   return gfx::ToNearestRect(element_bounds_);
 }
 
 gfx::Display AutofillPopupControllerImpl::GetDisplayNearestPoint(
     const gfx::Point& point) const {
   return gfx::Screen::GetScreenFor(container_view())->GetDisplayNearestPoint(
       point);
 }
 
@@ skipping 54 matching lines @@
   if (bottom_available >= popup_required_height ||
       bottom_available >= top_available) {
     // The popup can appear below the field.
     return std::make_pair(bottom_growth_start, popup_required_height);
   } else {
     // The popup must appear above the field.
     return std::make_pair(top_growth_end - popup_required_height,
                           popup_required_height);
   }
 }