[Payments] Change how the dialog gets destroyed.

chrome/browser/ui/views/payments/payment_request_dialog_view.cc

 // Copyright 2016 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/payments/payment_request_dialog_view.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
@@ skipping 49 matching lines @@
 
 PaymentRequestDialogView::PaymentRequestDialogView(
     PaymentRequest* request,
     PaymentRequestDialogView::ObserverForTest* observer)
     : request_(request), observer_for_testing_(observer), being_closed_(false) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (observer_for_testing_)
     request->spec()->add_observer_for_testing(this);
   SetLayoutManager(new views::FillLayout());
 
-  view_stack_.set_owned_by_client();
-  AddChildView(&view_stack_);
+  view_stack_ = base::MakeUnique<ViewStack>();
+  view_stack_->set_owned_by_client();
+  AddChildView(view_stack_.get());
 
   SetupSpinnerOverlay();
 
   ShowInitialPaymentSheet();
 }
 
 PaymentRequestDialogView::~PaymentRequestDialogView() {}
 
 ui::ModalType PaymentRequestDialogView::GetModalType() const {
   return ui::MODAL_TYPE_CHILD;
 }
 
 bool PaymentRequestDialogView::Cancel() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   // Called when the widget is about to close. We send a message to the
-  // PaymentRequest object to signal user cancellation. Before destroying the
-  // PaymentRequest object, we destroy all controllers so that they are not left
-  // alive with an invalid PaymentRequest pointer.
+  // PaymentRequest object to signal user cancellation.
+  //
+  // The order of destruction is important here. First destroy all the views
+  // because they may have pointers/delegates to their controllers. Then destroy
+  // all the controllers, because they may have pointers to PaymentRequestSpec/
+  // PaymentRequestState. Then send the signal to PaymentRequest to destroy.
   being_closed_ = true;
+  view_stack_.reset();
   controller_map_.clear();
   request_->UserCancelled();
   return true;
 }
 
 bool PaymentRequestDialogView::ShouldShowCloseButton() const {
   // Don't show the normal close button on the dialog. This is because the
   // typical dialog header doesn't allow displaying anything other that the
   // title and the close button. This is insufficient for the PaymentRequest
   // dialog, which must sometimes show the back arrow next to the title.
@@ skipping 13 matching lines @@
   constrained_window::ShowWebModalDialogViews(this, request_->web_contents());
 }
 
 void PaymentRequestDialogView::CloseDialog() {
   // This calls PaymentRequestDialogView::Cancel() before closing.
   // ViewHierarchyChanged() also gets called after Cancel().
   GetWidget()->Close();
 }
 
 void PaymentRequestDialogView::ShowErrorMessage() {
-  view_stack_.Push(CreateViewAndInstallController(
-                       base::MakeUnique<ErrorMessageViewController>(
-                           request_->spec(), request_->state(), this),
-                       &controller_map_),
-                   /* animate = */ false);
+  view_stack_->Push(CreateViewAndInstallController(
+                        base::MakeUnique<ErrorMessageViewController>(
+                            request_->spec(), request_->state(), this),
+                        &controller_map_),
+                    /* animate = */ false);
   if (observer_for_testing_)
     observer_for_testing_->OnErrorMessageShown();
 }
 
 void PaymentRequestDialogView::OnSpecUpdated() {
   // Since this is called in tests only, |observer_for_testing_| is defined.
   DCHECK(observer_for_testing_);
   observer_for_testing_->OnSpecDoneUpdating();
 }
 
 void PaymentRequestDialogView::Pay() {
   request_->Pay();
 }
 
 void PaymentRequestDialogView::GoBack() {
-  view_stack_.Pop();
+  view_stack_->Pop();
 
   if (observer_for_testing_)
     observer_for_testing_->OnBackNavigation();
 }
 
 void PaymentRequestDialogView::ShowContactProfileSheet() {
-  view_stack_.Push(
+  view_stack_->Push(
       CreateViewAndInstallController(
           ProfileListViewController::GetContactProfileViewController(
               request_->spec(), request_->state(), this),
           &controller_map_),
       /* animate */ true);
   if (observer_for_testing_)
     observer_for_testing_->OnContactInfoOpened();
 }
 
 void PaymentRequestDialogView::ShowOrderSummary() {
-  view_stack_.Push(CreateViewAndInstallController(
-                       base::MakeUnique<OrderSummaryViewController>(
-                           request_->spec(), request_->state(), this),
-                       &controller_map_),
-                   /* animate = */ true);
+  view_stack_->Push(CreateViewAndInstallController(
+                        base::MakeUnique<OrderSummaryViewController>(
+                            request_->spec(), request_->state(), this),
+                        &controller_map_),
+                    /* animate = */ true);
   if (observer_for_testing_)
     observer_for_testing_->OnOrderSummaryOpened();
 }
 
 void PaymentRequestDialogView::ShowPaymentMethodSheet() {
-  view_stack_.Push(CreateViewAndInstallController(
-                       base::MakeUnique<PaymentMethodViewController>(
-                           request_->spec(), request_->state(), this),
-                       &controller_map_),
-                   /* animate = */ true);
+  view_stack_->Push(CreateViewAndInstallController(
+                        base::MakeUnique<PaymentMethodViewController>(
+                            request_->spec(), request_->state(), this),
+                        &controller_map_),
+                    /* animate = */ true);
   if (observer_for_testing_)
     observer_for_testing_->OnPaymentMethodOpened();
 }
 
 void PaymentRequestDialogView::ShowShippingProfileSheet() {
-  view_stack_.Push(
+  view_stack_->Push(
       CreateViewAndInstallController(
           ProfileListViewController::GetShippingProfileViewController(
               request_->spec(), request_->state(), this),
           &controller_map_),
       /* animate = */ true);
   if (observer_for_testing_)
     observer_for_testing_->OnShippingAddressSectionOpened();
 }
 
 void PaymentRequestDialogView::ShowShippingOptionSheet() {
-  view_stack_.Push(CreateViewAndInstallController(
-                       base::MakeUnique<ShippingOptionViewController>(
-                           request_->spec(), request_->state(), this),
-                       &controller_map_),
-                   /* animate = */ true);
+  view_stack_->Push(CreateViewAndInstallController(
+                        base::MakeUnique<ShippingOptionViewController>(
+                            request_->spec(), request_->state(), this),
+                        &controller_map_),
+                    /* animate = */ true);
   if (observer_for_testing_)
     observer_for_testing_->OnShippingOptionSectionOpened();
 }
 
 void PaymentRequestDialogView::ShowCvcUnmaskPrompt(
     const autofill::CreditCard& credit_card,
     base::WeakPtr<autofill::payments::FullCardRequest::ResultDelegate>
         result_delegate,
     content::WebContents* web_contents) {
-  view_stack_.Push(CreateViewAndInstallController(
-                       base::MakeUnique<CvcUnmaskViewController>(
-                           request_->spec(), request_->state(), this,
-                           credit_card, result_delegate, web_contents),
-                       &controller_map_),
-                   /* animate = */ true);
+  view_stack_->Push(CreateViewAndInstallController(
+                        base::MakeUnique<CvcUnmaskViewController>(
+                            request_->spec(), request_->state(), this,
+                            credit_card, result_delegate, web_contents),
+                        &controller_map_),
+                    /* animate = */ true);
   if (observer_for_testing_)
     observer_for_testing_->OnCvcPromptShown();
 }
 
 void PaymentRequestDialogView::ShowCreditCardEditor(
     autofill::CreditCard* credit_card) {
-  view_stack_.Push(
+  view_stack_->Push(
       CreateViewAndInstallController(
           base::MakeUnique<CreditCardEditorViewController>(
               request_->spec(), request_->state(), this, credit_card),
           &controller_map_),
       /* animate = */ true);
   if (observer_for_testing_)
     observer_for_testing_->OnCreditCardEditorOpened();
 }
 
 void PaymentRequestDialogView::ShowShippingAddressEditor(
     autofill::AutofillProfile* profile) {
-  view_stack_.Push(CreateViewAndInstallController(
-                       base::MakeUnique<ShippingAddressEditorViewController>(
-                           request_->spec(), request_->state(), this, profile),
-                       &controller_map_),
-                   /* animate = */ true);
+  view_stack_->Push(CreateViewAndInstallController(
+                        base::MakeUnique<ShippingAddressEditorViewController>(
+                            request_->spec(), request_->state(), this, profile),
+                        &controller_map_),
+                    /* animate = */ true);
   if (observer_for_testing_)
     observer_for_testing_->OnShippingAddressEditorOpened();
 }
 
 void PaymentRequestDialogView::EditorViewUpdated() {
   if (observer_for_testing_)
     observer_for_testing_->OnEditorViewUpdated();
 }
 
 void PaymentRequestDialogView::ShowProcessingSpinner() {
   throbber_.Start();
   throbber_overlay_.SetVisible(true);
 }
 
 void PaymentRequestDialogView::ShowInitialPaymentSheet() {
-  view_stack_.Push(CreateViewAndInstallController(
-                       base::MakeUnique<PaymentSheetViewController>(
-                           request_->spec(), request_->state(), this),
-                       &controller_map_),
-                   /* animate = */ false);
+  view_stack_->Push(CreateViewAndInstallController(
+                        base::MakeUnique<PaymentSheetViewController>(
+                            request_->spec(), request_->state(), this),
+                        &controller_map_),
+                    /* animate = */ false);
   if (observer_for_testing_)
     observer_for_testing_->OnDialogOpened();
 }
 
 void PaymentRequestDialogView::SetupSpinnerOverlay() {
   throbber_.set_owned_by_client();
 
   throbber_overlay_.set_owned_by_client();
   throbber_overlay_.SetPaintToLayer();
   throbber_overlay_.SetVisible(false);
@@ skipping 41 matching lines @@
   // When a view that is associated with a controller is removed from this
   // view's descendants, dispose of the controller.
   if (!details.is_add &&
       controller_map_.find(details.child) != controller_map_.end()) {
     DCHECK(!details.move_view);
     controller_map_.erase(details.child);
   }
 }
 
 }  // namespace payments