Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(809)

Unified Diff: chrome/browser/ui/views/payments/order_summary_view_controller.cc

Issue 2748133004: [Payments] View controllers no longer have access to PaymentRequest (Closed)
Patch Set: Initial Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/payments/order_summary_view_controller.cc
diff --git a/chrome/browser/ui/views/payments/order_summary_view_controller.cc b/chrome/browser/ui/views/payments/order_summary_view_controller.cc
index d8b1a9ca373b6248fad446ef5c3102dc22831bf9..d168c9de2789e066e254fde5e925d63550291058 100644
--- a/chrome/browser/ui/views/payments/order_summary_view_controller.cc
+++ b/chrome/browser/ui/views/payments/order_summary_view_controller.cc
@@ -17,7 +17,6 @@
#include "chrome/browser/ui/views/payments/payment_request_views_util.h"
#include "chrome/grit/generated_resources.h"
#include "components/payments/content/payment_request_spec.h"
-#include "components/payments/content/payment_request_state.h"
#include "components/payments/core/currency_formatter.h"
#include "components/strings/grit/components_strings.h"
#include "ui/base/l10n/l10n_util.h"
@@ -85,14 +84,15 @@ std::unique_ptr<views::View> CreateLineItemView(const base::string16& label,
} // namespace
OrderSummaryViewController::OrderSummaryViewController(
- PaymentRequest* request,
+ PaymentRequestSpec* spec,
+ PaymentRequestState* state,
PaymentRequestDialogView* dialog)
- : PaymentRequestSheetController(request, dialog), pay_button_(nullptr) {
- request->state()->AddObserver(this);
+ : PaymentRequestSheetController(spec, state, dialog), pay_button_(nullptr) {
+ state->AddObserver(this);
}
OrderSummaryViewController::~OrderSummaryViewController() {
- request()->state()->RemoveObserver(this);
+ state()->RemoveObserver(this);
}
std::unique_ptr<views::View> OrderSummaryViewController::CreateView() {
@@ -110,31 +110,28 @@ std::unique_ptr<views::View> OrderSummaryViewController::CreateView() {
DialogViewID::ORDER_SUMMARY_LINE_ITEM_1,
DialogViewID::ORDER_SUMMARY_LINE_ITEM_2,
DialogViewID::ORDER_SUMMARY_LINE_ITEM_3};
- for (size_t i = 0; i < request()->spec()->details().display_items.size();
- i++) {
+ for (size_t i = 0; i < spec()->details().display_items.size(); i++) {
DialogViewID view_id =
i < line_items.size() ? line_items[i] : DialogViewID::VIEW_ID_NONE;
content_view->AddChildView(
CreateLineItemView(
- base::UTF8ToUTF16(
- request()->spec()->details().display_items[i]->label),
- request()->spec()->GetFormattedCurrencyAmount(
- request()->spec()->details().display_items[i]->amount->value),
+ base::UTF8ToUTF16(spec()->details().display_items[i]->label),
+ spec()->GetFormattedCurrencyAmount(
+ spec()->details().display_items[i]->amount->value),
false, view_id)
.release());
}
base::string16 total_label_value = l10n_util::GetStringFUTF16(
IDS_PAYMENT_REQUEST_ORDER_SUMMARY_SHEET_TOTAL_FORMAT,
- base::UTF8ToUTF16(request()->spec()->details().total->amount->currency),
- request()->spec()->GetFormattedCurrencyAmount(
- request()->spec()->details().total->amount->value));
+ base::UTF8ToUTF16(spec()->details().total->amount->currency),
+ spec()->GetFormattedCurrencyAmount(
+ spec()->details().total->amount->value));
content_view->AddChildView(
- CreateLineItemView(
- base::UTF8ToUTF16(request()->spec()->details().total->label),
- total_label_value, true,
- DialogViewID::ORDER_SUMMARY_TOTAL_AMOUNT_LABEL)
+ CreateLineItemView(base::UTF8ToUTF16(spec()->details().total->label),
+ total_label_value, true,
+ DialogViewID::ORDER_SUMMARY_TOTAL_AMOUNT_LABEL)
.release());
return CreatePaymentView(
@@ -153,12 +150,12 @@ OrderSummaryViewController::CreatePrimaryButton() {
button->set_tag(static_cast<int>(PaymentRequestCommonTags::PAY_BUTTON_TAG));
button->set_id(static_cast<int>(DialogViewID::PAY_BUTTON));
pay_button_ = button.get();
- UpdatePayButtonState(request()->state()->is_ready_to_pay());
+ UpdatePayButtonState(state()->is_ready_to_pay());
return button;
}
void OrderSummaryViewController::OnSelectedInformationChanged() {
- UpdatePayButtonState(request()->state()->is_ready_to_pay());
+ UpdatePayButtonState(state()->is_ready_to_pay());
}
void OrderSummaryViewController::UpdatePayButtonState(bool enabled) {

Powered by Google App Engine
This is Rietveld 408576698