[payment] display mixed currency in item list and shipping optiopns. When there is more than one cu…

components/payments/content/payment_details_validation.cc

Index: components/payments/content/payment_details_validation.cc
diff --git a/components/payments/content/payment_details_validation.cc b/components/payments/content/payment_details_validation.cc
index 1edd6fb1fa56e2f7138a384bf4264a3fc60aa213..8fb94b632891d7d5ae8bb5b63705e6fbf3eef95f 100644
--- a/components/payments/content/payment_details_validation.cc
+++ b/components/payments/content/payment_details_validation.cc
@@ -35,10 +35,12 @@ bool validateShippingOptionOrPaymentItem(
     return false;
   }
 
+#if !defined(OS_ANDROID)

[please use gerrit instead, 2017/05/05 19:13:55]

Desktop should behave the same as Android. Please remove lines 38-43. You can
add the relevant desktop UI in follow up patch (or ask a desktop engineer to
help).

[wuandy1, 2017/05/05 19:50:11]

Done.

   if (total && item->amount->currency != total->amount->currency) {
     *error_message = "Currencies must all be equal";
     return false;
   }
+#endif
 
   if (item->amount->currency_system.empty()) {
     *error_message = "Currency system can't be empty";