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

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

Issue 2631133003: [Payments] Introduce basic interactive browsertests for Payment Request (Closed)
Patch Set: ObserverForTest Created 3 years, 11 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/payment_request_dialog.cc
diff --git a/chrome/browser/ui/views/payments/payment_request_dialog.cc b/chrome/browser/ui/views/payments/payment_request_dialog.cc
index 58af72fbc2849df579a0295a15fb49a9e74438ed..99a2871e0967095fee99357e577ccb147779d880 100644
--- a/chrome/browser/ui/views/payments/payment_request_dialog.cc
+++ b/chrome/browser/ui/views/payments/payment_request_dialog.cc
@@ -21,8 +21,9 @@
namespace chrome {
void ShowPaymentRequestDialog(payments::PaymentRequest* request) {
- constrained_window::ShowWebModalDialogViews(
- new payments::PaymentRequestDialog(request), request->web_contents());
+ payments::PaymentRequestDialog::ShowWebModalPaymentDialog(
+ new payments::PaymentRequestDialog(request, /* no observer */ nullptr),
+ request);
}
} // namespace chrome
@@ -48,8 +49,10 @@ std::unique_ptr<views::View> CreateViewAndInstallController(
} // namespace
-PaymentRequestDialog::PaymentRequestDialog(PaymentRequest* request)
- : request_(request) {
+PaymentRequestDialog::PaymentRequestDialog(
+ PaymentRequest* request,
+ PaymentRequestDialog::ObserverForTest* observer)
+ : request_(request), observer_(observer) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
SetLayoutManager(new views::FillLayout());
@@ -109,10 +112,19 @@ void PaymentRequestDialog::CloseDialog() {
GetWidget()->Close();
}
+// static
+void PaymentRequestDialog::ShowWebModalPaymentDialog(
+ PaymentRequestDialog* dialog,
+ PaymentRequest* request) {
+ constrained_window::ShowWebModalDialogViews(dialog, request->web_contents());
+}
+
void PaymentRequestDialog::ShowInitialPaymentSheet() {
view_stack_.Push(CreateViewAndInstallController<PaymentSheetViewController>(
&controller_map_, request_, this),
false);
+ if (observer_)
+ observer_->OnDialogOpened();
}
gfx::Size PaymentRequestDialog::GetPreferredSize() const {

Powered by Google App Engine
This is Rietveld 408576698