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

Side by Side Diff: chrome/browser/ui/views/payments/payment_request_browsertest_base.cc

Issue 2709093006: Adding new shipping address editor view to payment flow. (Closed)
Patch Set: Bot failure fix 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 unified diff | Download patch
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/payments/payment_request_browsertest_base.h" 5 #include "chrome/browser/ui/views/payments/payment_request_browsertest_base.h"
6 6
7 #include <memory>
8 #include <string>
9 #include <utility>
7 #include <vector> 10 #include <vector>
8 11
9 #include "base/bind.h" 12 #include "base/bind.h"
10 #include "base/bind_helpers.h" 13 #include "base/bind_helpers.h"
11 #include "base/memory/ptr_util.h" 14 #include "base/memory/ptr_util.h"
12 #include "base/run_loop.h" 15 #include "base/run_loop.h"
13 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
14 #include "chrome/browser/autofill/personal_data_manager_factory.h" 17 #include "chrome/browser/autofill/personal_data_manager_factory.h"
15 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/ui/browser.h" 19 #include "chrome/browser/ui/browser.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 void PaymentRequestBrowserTestBase::OnOrderSummaryOpened() { 93 void PaymentRequestBrowserTestBase::OnOrderSummaryOpened() {
91 if (event_observer_) 94 if (event_observer_)
92 event_observer_->Observe(DialogEvent::ORDER_SUMMARY_OPENED); 95 event_observer_->Observe(DialogEvent::ORDER_SUMMARY_OPENED);
93 } 96 }
94 97
95 void PaymentRequestBrowserTestBase::OnPaymentMethodOpened() { 98 void PaymentRequestBrowserTestBase::OnPaymentMethodOpened() {
96 if (event_observer_) 99 if (event_observer_)
97 event_observer_->Observe(DialogEvent::PAYMENT_METHOD_OPENED); 100 event_observer_->Observe(DialogEvent::PAYMENT_METHOD_OPENED);
98 } 101 }
99 102
103 void PaymentRequestBrowserTestBase::OnShippingSectionOpened() {
104 if (event_observer_)
105 event_observer_->Observe(DialogEvent::SHIPPING_SECTION_OPENED);
106 }
107
100 void PaymentRequestBrowserTestBase::OnCreditCardEditorOpened() { 108 void PaymentRequestBrowserTestBase::OnCreditCardEditorOpened() {
101 if (event_observer_) 109 if (event_observer_)
102 event_observer_->Observe(DialogEvent::CREDIT_CARD_EDITOR_OPENED); 110 event_observer_->Observe(DialogEvent::CREDIT_CARD_EDITOR_OPENED);
103 } 111 }
104 112
113 void PaymentRequestBrowserTestBase::OnShippingAddressEditorOpened() {
114 if (event_observer_)
115 event_observer_->Observe(DialogEvent::SHIPPING_ADDRESS_EDITOR_OPENED);
116 }
117
105 void PaymentRequestBrowserTestBase::OnBackNavigation() { 118 void PaymentRequestBrowserTestBase::OnBackNavigation() {
106 if (event_observer_) 119 if (event_observer_)
107 event_observer_->Observe(DialogEvent::BACK_NAVIGATION); 120 event_observer_->Observe(DialogEvent::BACK_NAVIGATION);
108 } 121 }
109 122
110 void PaymentRequestBrowserTestBase::OnContactInfoOpened() { 123 void PaymentRequestBrowserTestBase::OnContactInfoOpened() {
111 if (event_observer_) 124 if (event_observer_)
112 event_observer_->Observe(DialogEvent::CONTACT_INFO_OPENED); 125 event_observer_->Observe(DialogEvent::CONTACT_INFO_OPENED);
113 } 126 }
114 127
128 void PaymentRequestBrowserTestBase::OnEditorViewUpdated() {
129 if (event_observer_)
130 event_observer_->Observe(DialogEvent::EDITOR_VIEW_UPDATED);
131 }
132
115 void PaymentRequestBrowserTestBase::OnWidgetDestroyed(views::Widget* widget) { 133 void PaymentRequestBrowserTestBase::OnWidgetDestroyed(views::Widget* widget) {
116 if (event_observer_) 134 if (event_observer_)
117 event_observer_->Observe(DialogEvent::DIALOG_CLOSED); 135 event_observer_->Observe(DialogEvent::DIALOG_CLOSED);
118 } 136 }
119 137
120 void PaymentRequestBrowserTestBase::InvokePaymentRequestUI() { 138 void PaymentRequestBrowserTestBase::InvokePaymentRequestUI() {
121 ResetEventObserver(DialogEvent::DIALOG_OPENED); 139 ResetEventObserver(DialogEvent::DIALOG_OPENED);
122 140
123 content::WebContents* web_contents = GetActiveWebContents(); 141 content::WebContents* web_contents = GetActiveWebContents();
124 const std::string click_buy_button_js = 142 const std::string click_buy_button_js =
(...skipping 30 matching lines...) Expand all
155 173
156 ClickOnDialogViewAndWait(DialogViewID::PAYMENT_SHEET_SUMMARY_SECTION); 174 ClickOnDialogViewAndWait(DialogViewID::PAYMENT_SHEET_SUMMARY_SECTION);
157 } 175 }
158 176
159 void PaymentRequestBrowserTestBase::OpenPaymentMethodScreen() { 177 void PaymentRequestBrowserTestBase::OpenPaymentMethodScreen() {
160 ResetEventObserver(DialogEvent::PAYMENT_METHOD_OPENED); 178 ResetEventObserver(DialogEvent::PAYMENT_METHOD_OPENED);
161 179
162 ClickOnDialogViewAndWait(DialogViewID::PAYMENT_SHEET_PAYMENT_METHOD_SECTION); 180 ClickOnDialogViewAndWait(DialogViewID::PAYMENT_SHEET_PAYMENT_METHOD_SECTION);
163 } 181 }
164 182
183 void PaymentRequestBrowserTestBase::OpenShippingSectionScreen() {
184 ResetEventObserver(DialogEvent::SHIPPING_SECTION_OPENED);
185
186 ClickOnDialogViewAndWait(DialogViewID::PAYMENT_SHEET_SHIPPING_SECTION);
187 }
188
165 void PaymentRequestBrowserTestBase::OpenCreditCardEditorScreen() { 189 void PaymentRequestBrowserTestBase::OpenCreditCardEditorScreen() {
166 ResetEventObserver(DialogEvent::CREDIT_CARD_EDITOR_OPENED); 190 ResetEventObserver(DialogEvent::CREDIT_CARD_EDITOR_OPENED);
167 191
168 ClickOnDialogViewAndWait(DialogViewID::PAYMENT_METHOD_ADD_CARD_BUTTON); 192 ClickOnDialogViewAndWait(DialogViewID::PAYMENT_METHOD_ADD_CARD_BUTTON);
169 } 193 }
170 194
195 void PaymentRequestBrowserTestBase::OpenShippingAddressEditorScreen() {
196 ResetEventObserver(DialogEvent::SHIPPING_ADDRESS_EDITOR_OPENED);
197
198 ClickOnDialogViewAndWait(DialogViewID::PAYMENT_METHOD_ADD_SHIPPING_BUTTON);
199 }
200
171 content::WebContents* PaymentRequestBrowserTestBase::GetActiveWebContents() { 201 content::WebContents* PaymentRequestBrowserTestBase::GetActiveWebContents() {
172 return browser()->tab_strip_model()->GetActiveWebContents(); 202 return browser()->tab_strip_model()->GetActiveWebContents();
173 } 203 }
174 204
175 const std::vector<PaymentRequest*> 205 const std::vector<PaymentRequest*>
176 PaymentRequestBrowserTestBase::GetPaymentRequests( 206 PaymentRequestBrowserTestBase::GetPaymentRequests(
177 content::WebContents* web_contents) { 207 content::WebContents* web_contents) {
178 PaymentRequestWebContentsManager* manager = 208 PaymentRequestWebContentsManager* manager =
179 PaymentRequestWebContentsManager::GetOrCreateForWebContents(web_contents); 209 PaymentRequestWebContentsManager::GetOrCreateForWebContents(web_contents);
180 if (!manager) 210 if (!manager)
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 397
368 void PaymentRequestBrowserTestBase::ResetEventObserver(DialogEvent event) { 398 void PaymentRequestBrowserTestBase::ResetEventObserver(DialogEvent event) {
369 event_observer_ = base::MakeUnique<DialogEventObserver>(event); 399 event_observer_ = base::MakeUnique<DialogEventObserver>(event);
370 } 400 }
371 401
372 void PaymentRequestBrowserTestBase::WaitForObservedEvent() { 402 void PaymentRequestBrowserTestBase::WaitForObservedEvent() {
373 event_observer_->Wait(); 403 event_observer_->Wait();
374 } 404 }
375 405
376 } // namespace payments 406 } // namespace payments
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698