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

components/payments/content/payment_details_validation.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/payments/content/payment_details_validation.h"
 
 #include <set>
 #include <vector>
 
 #include "components/payments/content/payments_validators.h"
@@ skipping 17 matching lines @@
   if (item->amount->currency.empty()) {
     *error_message = "Currency code required";
     return false;
   }
 
   if (item->amount->value.empty()) {
     *error_message = "Currency value required";
     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";
     return false;
   }
 
   if (!payments::PaymentsValidators::isValidCurrencyCodeFormat(
           item->amount->currency, item->amount->currency_system,
           error_message)) {
     return false;
@@ skipping 112 matching lines @@
     if (!validatePaymentDetailsModifiers(details->modifiers, details->total,
                                          error_message))
       return false;
   }
   if (!PaymentsValidators::isValidErrorMsgFormat(details->error, error_message))
     return false;
   return true;
 }
 
 }  // namespace payments