Creating PaymentOptionsProvider interface

chrome/browser/ui/views/payments/payment_request_views_util.h

Index: chrome/browser/ui/views/payments/payment_request_views_util.h
diff --git a/chrome/browser/ui/views/payments/payment_request_views_util.h b/chrome/browser/ui/views/payments/payment_request_views_util.h
index 575a567fe2bc61c356f9e939f9835e251107579b..225f1b6cc4b4138cb2668733354fbd6eec5c1b2a 100644
--- a/chrome/browser/ui/views/payments/payment_request_views_util.h
+++ b/chrome/browser/ui/views/payments/payment_request_views_util.h
@@ -10,6 +10,7 @@
 
 #include "base/strings/string16.h"
 #include "components/payments/content/payment_request.mojom.h"
+#include "components/payments/core/payment_options_provider.h"

[please use gerrit instead, 2017/03/29 21:45:16]

It should be possible to forward-declare PaymentOptionsProvider instead.

[tmartino, 2017/03/30 03:14:22]

Done

 
 namespace autofill {
 class AutofillProfile;
@@ -80,9 +81,7 @@ std::unique_ptr<views::View> GetContactInfoLabel(
     AddressStyleType type,
     const std::string& locale,
     const autofill::AutofillProfile& profile,
-    bool show_payer_name,
-    bool show_payer_phone,
-    bool show_payer_email);
+    PaymentOptionsProvider* options);

[please use gerrit instead, 2017/03/29 21:45:16]

const-ref because you don't plan to modify the |options|.

[tmartino, 2017/03/30 03:14:22]

Done.

 
 // Creates a views::Border object that can paint the gray horizontal ruler used
 // as a separator between items in the Payment Request dialog.
@@ -92,9 +91,9 @@ std::unique_ptr<views::Border> CreatePaymentRequestRowBorder();
 std::unique_ptr<views::Label> CreateBoldLabel(const base::string16& text);
 
 base::string16 GetShippingAddressSectionString(
-    payments::mojom::PaymentShippingType shipping_type);
+    PaymentShippingType shipping_type);
 base::string16 GetShippingOptionSectionString(
-    payments::mojom::PaymentShippingType shipping_type);
+    PaymentShippingType shipping_type);
 
 std::unique_ptr<views::View> CreateShippingOptionLabel(
     payments::mojom::PaymentShippingOption* shipping_option,