Use WeakPtr to simplify AutofillPopupControllerImpl memory management

chrome/browser/ui/autofill/autofill_dialog_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_dialog_controller_impl.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/string_split.h"
@@ skipping 119 matching lines @@
       contents_(contents),
       form_structure_(form),
       source_url_(source_url),
       ssl_status_(ssl_status),
       callback_(callback),
       wallet_client_(profile_->GetRequestContext()),
       ALLOW_THIS_IN_INITIALIZER_LIST(suggested_email_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(suggested_cc_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(suggested_billing_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(suggested_shipping_(this)),
-      popup_controller_(NULL),
       section_showing_popup_(SECTION_BILLING) {
   // TODO(estade): |this| should observe PersonalDataManager.
   // TODO(estade): remove duplicates from |form|?
 
   content::NavigationEntry* entry = contents->GetController().GetActiveEntry();
   const GURL& active_url = entry ? entry->GetURL() : web_contents()->GetURL();
   invoked_from_same_origin_ = active_url.GetOrigin() == source_url_.GetOrigin();
 }
 
 AutofillDialogControllerImpl::~AutofillDialogControllerImpl() {
@@ skipping 424 matching lines @@
   return profile_;
 }
 
 content::WebContents* AutofillDialogControllerImpl::web_contents() {
   return contents_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutofillPopupDelegate
 
+void AutofillDialogControllerImpl::OnPopupShown(
+    content::KeyboardListener* listener) {}
+
+void AutofillDialogControllerImpl::OnPopupHidden(
+    content::KeyboardListener* listener) {}
+
 void AutofillDialogControllerImpl::DidSelectSuggestion(int identifier) {
   // TODO(estade): implement.
 }
 
 void AutofillDialogControllerImpl::DidAcceptSuggestion(const string16& value,
                                                        int identifier) {
   const PersonalDataManager::GUIDPair& pair = popup_guids_[identifier];
 
   FormGroup* form_group = section_showing_popup_ == SECTION_CC ?
       static_cast<FormGroup*>(GetManager()->GetCreditCardByGUID(pair.first)) :
@@ skipping 15 matching lines @@
 
 void AutofillDialogControllerImpl::RemoveSuggestion(const string16& value,
                                                     int identifier) {
   // TODO(estade): implement.
 }
 
 void AutofillDialogControllerImpl::ClearPreviewedForm() {
   // TODO(estade): implement.
 }
 
-void AutofillDialogControllerImpl::ControllerDestroyed() {
-  popup_controller_ = NULL;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // content::NotificationObserver
 
 void AutofillDialogControllerImpl::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(type, content::NOTIFICATION_NAV_ENTRY_COMMITTED);
   content::LoadCommittedDetails* load_details =
       content::Details<content::LoadCommittedDetails>(details).ptr();
@@ skipping 292 matching lines @@
 PersonalDataManager* AutofillDialogControllerImpl::GetManager() {
   return PersonalDataManagerFactory::GetForProfile(profile_);
 }
 
 DetailInputs* AutofillDialogControllerImpl::MutableRequestedFieldsForSection(
     DialogSection section) {
   return const_cast<DetailInputs*>(&RequestedFieldsForSection(section));
 }
 
 void AutofillDialogControllerImpl::HidePopup() {
-  if (popup_controller_) {
+  if (popup_controller_)
     popup_controller_->Hide();
-    ControllerDestroyed();
-  }
 }
 
 }  // namespace autofill