Commit 8329ebd3 authored by hcarmona's avatar hcarmona Committed by Commit bot

[MD Settings] Show '(copied to Chrome)' on credit cards that are local.

Swaps Chrome/Chromium where appropriate.
Screenshot in bug.

BUG=622174
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2106253002
Cr-Commit-Position: refs/heads/master@{#403194}
parent 8dcc2faa
...@@ -28,6 +28,11 @@ ...@@ -28,6 +28,11 @@
</message> </message>
</if> </if>
<!-- Autofill Page -->
<message name="IDS_SETTINGS_GOOGLE_PAYMENTS_CACHED" desc="Label that will be used to show that a credit card comes from Google Payments and is saved locally. This should follow the casing of the 'Google Payments' and 'Chrome' brands.">
Google Payments (copied to Chromium)
</message>
<!-- Default Browser Page --> <!-- Default Browser Page -->
<if expr="not chromeos"> <if expr="not chromeos">
<message name="IDS_SETTINGS_DEFAULT_BROWSER_DEFAULT" desc="The text displayed when Chrome is not the default browser"> <message name="IDS_SETTINGS_DEFAULT_BROWSER_DEFAULT" desc="The text displayed when Chrome is not the default browser">
......
...@@ -28,6 +28,11 @@ ...@@ -28,6 +28,11 @@
</message> </message>
</if> </if>
<!-- Autofill Page -->
<message name="IDS_SETTINGS_GOOGLE_PAYMENTS_CACHED" desc="Label that will be used to show that a credit card comes from Google Payments and is saved locally. This should follow the casing of the 'Google Payments' and 'Chrome' brands.">
Google Payments (copied to Chrome)
</message>
<!-- Default Browser Page --> <!-- Default Browser Page -->
<if expr="not chromeos"> <if expr="not chromeos">
<message name="IDS_SETTINGS_DEFAULT_BROWSER_DEFAULT" desc="The text displayed when Chrome is not the default browser"> <message name="IDS_SETTINGS_DEFAULT_BROWSER_DEFAULT" desc="The text displayed when Chrome is not the default browser">
......
...@@ -46,8 +46,7 @@ ...@@ -46,8 +46,7 @@
<div class="list-item two-line"> <div class="list-item two-line">
<div class="start"> <div class="start">
<span id="addressSummary">[[address_(item)]]</span> <span id="addressSummary">[[address_(item)]]</span>
<span class="payments-label" <span class="payments-label" hidden$="[[item.metadata.isLocal]]">
hidden$="[[item.metadata.isLocal]]">
$i18n{googlePayments} $i18n{googlePayments}
</span> </span>
</div> </div>
...@@ -80,9 +79,13 @@ ...@@ -80,9 +79,13 @@
<div class="list-item two-line"> <div class="list-item two-line">
<div class="type-column"> <div class="type-column">
<span id="creditCardLabel">[[item.metadata.summaryLabel]]</span> <span id="creditCardLabel">[[item.metadata.summaryLabel]]</span>
<span class="payments-label" <span class="payments-label" hidden$="[[item.metadata.isLocal]]">
hidden$="[[item.metadata.isLocal]]"> <span hidden$="[[item.metadata.isCached]]">
$i18n{googlePayments} $i18n{googlePayments}
</span>
<span hidden$="[[!item.metadata.isCached]]">
$i18n{googlePaymentsCached}
</span>
</span> </span>
</div> </div>
<div class="expiration-column"> <div class="expiration-column">
......
...@@ -697,6 +697,7 @@ void AddPasswordsAndFormsStrings(content::WebUIDataSource* html_source) { ...@@ -697,6 +697,7 @@ void AddPasswordsAndFormsStrings(content::WebUIDataSource* html_source) {
IDS_SETTINGS_PASSWORDS_AND_AUTOFILL_PAGE_TITLE}, IDS_SETTINGS_PASSWORDS_AND_AUTOFILL_PAGE_TITLE},
{"autofill", IDS_SETTINGS_AUTOFILL}, {"autofill", IDS_SETTINGS_AUTOFILL},
{"googlePayments", IDS_SETTINGS_GOOGLE_PAYMENTS}, {"googlePayments", IDS_SETTINGS_GOOGLE_PAYMENTS},
{"googlePaymentsCached", IDS_SETTINGS_GOOGLE_PAYMENTS_CACHED},
{"addresses", IDS_SETTINGS_AUTOFILL_ADDRESSES_HEADING}, {"addresses", IDS_SETTINGS_AUTOFILL_ADDRESSES_HEADING},
{"addAddress", IDS_SETTINGS_AUTOFILL_ADD_ADDRESS_BUTTON}, {"addAddress", IDS_SETTINGS_AUTOFILL_ADD_ADDRESS_BUTTON},
{"editAddress", IDS_SETTINGS_ADDRESS_EDIT}, {"editAddress", IDS_SETTINGS_ADDRESS_EDIT},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment