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

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

Issue 2768093006: [Payments] Desktop: Error message in the dialog. (Closed)
Patch Set: Test 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/payment_request_browsertest_base.cc
diff --git a/chrome/browser/ui/views/payments/payment_request_browsertest_base.cc b/chrome/browser/ui/views/payments/payment_request_browsertest_base.cc
index f9f50d56483d7a45b636685958d6b88cbc9f74a9..a7f3200987babe22337c91f88636f2db6b86a7e0 100644
--- a/chrome/browser/ui/views/payments/payment_request_browsertest_base.cc
+++ b/chrome/browser/ui/views/payments/payment_request_browsertest_base.cc
@@ -141,6 +141,11 @@ void PaymentRequestBrowserTestBase::OnEditorViewUpdated() {
event_observer_->Observe(DialogEvent::EDITOR_VIEW_UPDATED);
}
+void PaymentRequestBrowserTestBase::OnErrorMessageShown() {
+ if (event_observer_)
+ event_observer_->Observe(DialogEvent::ERROR_MESSAGE_SHOWN);
+}
+
void PaymentRequestBrowserTestBase::OnWidgetDestroyed(views::Widget* widget) {
if (event_observer_)
event_observer_->Observe(DialogEvent::DIALOG_CLOSED);
@@ -281,15 +286,17 @@ void PaymentRequestBrowserTestBase::CreatePaymentRequestForTest(
}
void PaymentRequestBrowserTestBase::ClickOnDialogViewAndWait(
- DialogViewID view_id) {
+ DialogViewID view_id,
+ bool wait_for_animation) {
views::View* view =
delegate_->dialog_view()->GetViewByID(static_cast<int>(view_id));
DCHECK(view);
- ClickOnDialogViewAndWait(view);
+ ClickOnDialogViewAndWait(view, wait_for_animation);
}
void PaymentRequestBrowserTestBase::ClickOnDialogViewAndWait(
- views::View* view) {
+ views::View* view,
+ bool wait_for_animation) {
DCHECK(view);
ui::MouseEvent pressed(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
@@ -300,7 +307,8 @@ void PaymentRequestBrowserTestBase::ClickOnDialogViewAndWait(
ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
view->OnMouseReleased(released_event);
- WaitForAnimation();
+ if (wait_for_animation)
+ WaitForAnimation();
WaitForObservedEvent();
}

Powered by Google App Engine
This is Rietveld 408576698