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

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

Issue 2759253002: [Web Payments] Implement item selection in lists. (Closed)
Patch Set: Assert back navigation in browser tests. 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/shipping_option_view_controller.cc
diff --git a/chrome/browser/ui/views/payments/shipping_option_view_controller.cc b/chrome/browser/ui/views/payments/shipping_option_view_controller.cc
index 19194f3e45a43f19a734a893964a8bfbef95b9a9..59a13365c3fa8ea30b66487adcdab99bc5c7fa2e 100644
--- a/chrome/browser/ui/views/payments/shipping_option_view_controller.cc
+++ b/chrome/browser/ui/views/payments/shipping_option_view_controller.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/ui/views/payments/shipping_option_view_controller.h"
+#include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
#include "chrome/browser/ui/views/payments/payment_request_views_util.h"
#include "components/payments/content/payment_request_spec.h"
#include "components/payments/content/payment_request_state.h"
@@ -18,9 +19,11 @@ class ShippingOptionItem : public PaymentRequestItemList::Item {
PaymentRequestSpec* spec,
PaymentRequestState* state,
PaymentRequestItemList* parent_list,
+ PaymentRequestDialogView* dialog,
bool selected)
: PaymentRequestItemList::Item(spec, state, parent_list, selected),
- shipping_option_(shipping_option) {}
+ shipping_option_(shipping_option),
+ dialog_(dialog) {}
~ShippingOptionItem() override {}
private:
@@ -31,7 +34,12 @@ class ShippingOptionItem : public PaymentRequestItemList::Item {
spec()->GetFormattedCurrencyAmount(shipping_option_->amount->value));
}
- void SelectedStateChanged() override {}
+ void SelectedStateChanged() override {
+ if (selected()) {
+ state()->SetSelectedShippingOption(shipping_option_);
+ dialog_->GoBack();
+ }
+ }
bool CanBeSelected() const override {
// Shipping options are vetted by the website; they're all OK to select.
@@ -44,6 +52,7 @@ class ShippingOptionItem : public PaymentRequestItemList::Item {
}
mojom::PaymentShippingOption* shipping_option_;
+ PaymentRequestDialogView* dialog_;
DISALLOW_COPY_AND_ASSIGN(ShippingOptionItem);
};
@@ -57,7 +66,7 @@ ShippingOptionViewController::ShippingOptionViewController(
: PaymentRequestSheetController(spec, state, dialog) {
for (const auto& option : spec->details().shipping_options) {
shipping_option_list_.AddItem(base::MakeUnique<ShippingOptionItem>(
- option.get(), spec, state, &shipping_option_list_,
+ option.get(), spec, state, &shipping_option_list_, dialog,
option.get() == state->selected_shipping_option()));
}
}

Powered by Google App Engine
This is Rietveld 408576698