[Payments] View controllers no longer have access to PaymentRequest

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

 // Copyright 2017 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_method_view_controller.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
 #include "chrome/browser/ui/views/payments/payment_request_row_view.h"
 #include "chrome/browser/ui/views/payments/payment_request_views_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
-#include "components/payments/content/payment_request.h"
 #include "components/payments/content/payment_request_state.h"
 #include "components/strings/grit/components_strings.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/vector_icons.h"
@@ skipping 10 matching lines @@
   // |kFirstTagValue| not to conflict with tags common to all views.
   ADD_CREDIT_CARD_BUTTON = kFirstTagValue,
 };
 
 class PaymentMethodListItem : public payments::PaymentRequestItemList::Item {
  public:
   // Does not take ownership of |card|, which  should not be null and should
   // outlive this object. |list| is the PaymentRequestItemList object that will
   // own this.
   PaymentMethodListItem(autofill::CreditCard* card,
-                        PaymentRequest* request,
+                        PaymentRequestSpec* spec,
+                        PaymentRequestState* state,
                         PaymentRequestItemList* list,
                         bool selected)
-      : payments::PaymentRequestItemList::Item(request, list, selected),
+      : payments::PaymentRequestItemList::Item(spec, state, list, selected),
         card_(card) {}
   ~PaymentMethodListItem() override {}
 
  private:
   // payments::PaymentRequestItemList::Item:
   std::unique_ptr<views::View> CreateItemView() override {
     std::unique_ptr<PaymentRequestRowView> row =
         base::MakeUnique<PaymentRequestRowView>(this);
     views::GridLayout* layout = new views::GridLayout(row.get());
     layout->SetInsets(
@@ skipping 55 matching lines @@
 
     return std::move(row);
   }
 
   void SelectedStateChanged() override {
     // This could be called before CreateItemView, so before |checkmark_| is
     // instantiated.
     if (checkmark_)
       checkmark_->SetVisible(selected());
 
-    request()->state()->SetSelectedCreditCard(card_);
+    state()->SetSelectedCreditCard(card_);
   }
 
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override {
     if (IsComplete()) {
       list()->SelectItem(this);
     } else {
       // TODO(anthonyvd): Display the editor, pre-populated with the data that
       // already exists in |card|.
     }
   }
 
   bool IsComplete() const {
     // TODO(anthonyvd): Hook this up to the card completedness logic when it's
     // implemented in PaymentRequest.
     return true;
   }
 
   autofill::CreditCard* card_;
   std::unique_ptr<views::ImageView> checkmark_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentMethodListItem);
 };
 
 }  // namespace
 
 PaymentMethodViewController::PaymentMethodViewController(
-    PaymentRequest* request,
+    PaymentRequestSpec* spec,
+    PaymentRequestState* state,
     PaymentRequestDialogView* dialog)
-    : PaymentRequestSheetController(request, dialog) {
+    : PaymentRequestSheetController(spec, state, dialog) {
   const std::vector<autofill::CreditCard*>& available_cards =
-      request->state()->credit_cards();
+      state->credit_cards();
 
   for (autofill::CreditCard* card : available_cards) {
     std::unique_ptr<PaymentMethodListItem> item =
         base::MakeUnique<PaymentMethodListItem>(
-            card, request, &payment_method_list_,
-            card == request->state()->selected_credit_card());
+            card, spec, state, &payment_method_list_,
+            card == state->selected_credit_card());
     payment_method_list_.AddItem(std::move(item));
   }
 }
 
 PaymentMethodViewController::~PaymentMethodViewController() {}
 
 std::unique_ptr<views::View> PaymentMethodViewController::CreateView() {
   std::unique_ptr<views::View> list_view =
       payment_method_list_.CreateListView();
   list_view->set_id(
@@ skipping 32 matching lines @@
         PaymentMethodViewControllerTags::ADD_CREDIT_CARD_BUTTON):
       dialog()->ShowCreditCardEditor();
       break;
     default:
       PaymentRequestSheetController::ButtonPressed(sender, event);
       break;
   }
 }
 
 }  // namespace payments