[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 22 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 (total && item->amount->currency != total->amount->currency) {

[gogerald1, 2017/05/02 18:57:33]

This is cross platform code, might '#if !defined(OS_ANDROID)' before other
platforms support mixed currency.

[wuandy, 2017/05/05 15:04:37]

Done.

-    *error_message = "Currencies must all be equal";
-    return false;
-  }
-
   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 111 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