Settings People Revamp: Add Payments integration to new Sync Settings.

Settings People Revamp: Add Payments integration to new Sync Settings.

Very similar to this patch: https://codereview.chromium.org/1578173005/

It adds Payments integration to the new MD Settings just like the it
was added to the old Options implementation in Jan 2016.

BUG=608492, 563721
TEST=MANUAL
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation

Committed: https://crrev.com/3a5ea77b5636b462910521845296eeb16b8f7403
Cr-Commit-Position: refs/heads/master@{#400199}

[tommycli, 2016-06-14 18:53:43]

Description was changed from

==========
Settings People Revamp: Add Wallet integration to new Sync Settings.

Very similar to this patch: https://codereview.chromium.org/1578173005/

It adds Wallet integration to the new MD Settings just like the it
was added to the old Options implementation in Jan 2016.

BUG=608492, 563721
==========

to

==========
Settings People Revamp: Add Wallet integration to new Sync Settings.

Very similar to this patch: https://codereview.chromium.org/1578173005/

It adds Wallet integration to the new MD Settings just like the it
was added to the old Options implementation in Jan 2016.

BUG=608492, 563721
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation
==========

[tommycli, 2016-06-14 18:54:12]

Description was changed from

==========
Settings People Revamp: Add Wallet integration to new Sync Settings.

Very similar to this patch: https://codereview.chromium.org/1578173005/

It adds Wallet integration to the new MD Settings just like the it
was added to the old Options implementation in Jan 2016.

BUG=608492, 563721
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation
==========

to

==========
Settings People Revamp: Add Wallet integration to new Sync Settings.

Very similar to this patch: https://codereview.chromium.org/1578173005/

It adds Wallet integration to the new MD Settings just like the it
was added to the old Options implementation in Jan 2016.

BUG=608492, 563721
TEST=MANUAL
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation
==========

[tommycli, 2016-06-14 18:56:51]

tommycli@chromium.org changed reviewers:
+ jdonnelly@chromium.org

[tommycli, 2016-06-14 18:56:51]

jdonnelly: PTAL, this is similar to your old patch listed in the description.

Here's a screenshot: http://imgur.com/7YoDuz2

Thanks!

[Justin Donnelly, 2016-06-14 19:56:41]

Please change "Wallet" to "Payments" in the CL description.

https://codereview.chromium.org/2068653003/diff/20001/chrome/browser/resource...
File chrome/browser/resources/settings/people_page/sync_page.html (left):

https://codereview.chromium.org/2068653003/diff/20001/chrome/browser/resource...
chrome/browser/resources/settings/people_page/sync_page.html:100:
<paper-checkbox checked="{{syncPrefs.tabsSynced}}"
Is this intentional that you're removing the tabs option?

https://codereview.chromium.org/2068653003/diff/20001/chrome/browser/resource...
File chrome/browser/resources/settings/people_page/sync_page.html (right):

https://codereview.chromium.org/2068653003/diff/20001/chrome/browser/resource...
chrome/browser/resources/settings/people_page/sync_page.html:52: <!-- Autofill
has a special on-change handler to deal with Wallet. -->
s/Wallet/Payments/ (Replace "Wallet" with "Payments".)

https://codereview.chromium.org/2068653003/diff/20001/chrome/browser/resource...
chrome/browser/resources/settings/people_page/sync_page.html:110:
disabled="[[shouldWalletCheckboxBeDisabled_(
s/Wallet/Payments/

https://codereview.chromium.org/2068653003/diff/20001/chrome/browser/resource...
File chrome/browser/resources/settings/people_page/sync_page.js (right):

https://codereview.chromium.org/2068653003/diff/20001/chrome/browser/resource...
chrome/browser/resources/settings/people_page/sync_page.js:176: // If autofill
is not registered or synced, force payments integration off.
s/payments/Payments/

https://codereview.chromium.org/2068653003/diff/20001/chrome/browser/resource...
chrome/browser/resources/settings/people_page/sync_page.js:178:
this.set('syncPrefs.paymentsIntegrationEnabled', false);
I think there may be an opportunity to fix https://crbug.com/609087 if we
*don't* do this. Let's discuss offline.

[tommycli, 2016-06-14 20:41:23]

Description was changed from

==========
Settings People Revamp: Add Wallet integration to new Sync Settings.

Very similar to this patch: https://codereview.chromium.org/1578173005/

It adds Wallet integration to the new MD Settings just like the it
was added to the old Options implementation in Jan 2016.

BUG=608492, 563721
TEST=MANUAL
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation
==========

to

==========
Settings People Revamp: Add Payments integration to new Sync Settings.

Very similar to this patch: https://codereview.chromium.org/1578173005/

It adds Payments integration to the new MD Settings just like the it
was added to the old Options implementation in Jan 2016.

BUG=608492, 563721
TEST=MANUAL
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation
==========

[tommycli, 2016-06-14 20:42:09]

jdonnely: Thanks!

https://codereview.chromium.org/2068653003/diff/20001/chrome/browser/resource...
File chrome/browser/resources/settings/people_page/sync_page.html (left):

https://codereview.chromium.org/2068653003/diff/20001/chrome/browser/resource...
chrome/browser/resources/settings/people_page/sync_page.html:100:
<paper-checkbox checked="{{syncPrefs.tabsSynced}}"
On 2016/06/14 19:56:41, Justin Donnelly wrote:
> Is this intentional that you're removing the tabs option?

Done.

Thanks. It was a mistake that I removed this.

https://codereview.chromium.org/2068653003/diff/20001/chrome/browser/resource...
File chrome/browser/resources/settings/people_page/sync_page.html (right):

https://codereview.chromium.org/2068653003/diff/20001/chrome/browser/resource...
chrome/browser/resources/settings/people_page/sync_page.html:52: <!-- Autofill
has a special on-change handler to deal with Wallet. -->
On 2016/06/14 19:56:41, Justin Donnelly wrote:
> s/Wallet/Payments/ (Replace "Wallet" with "Payments".)

Done.

https://codereview.chromium.org/2068653003/diff/20001/chrome/browser/resource...
chrome/browser/resources/settings/people_page/sync_page.html:110:
disabled="[[shouldWalletCheckboxBeDisabled_(
On 2016/06/14 19:56:41, Justin Donnelly wrote:
> s/Wallet/Payments/

Done.

https://codereview.chromium.org/2068653003/diff/20001/chrome/browser/resource...
File chrome/browser/resources/settings/people_page/sync_page.js (right):

https://codereview.chromium.org/2068653003/diff/20001/chrome/browser/resource...
chrome/browser/resources/settings/people_page/sync_page.js:176: // If autofill
is not registered or synced, force payments integration off.
On 2016/06/14 19:56:41, Justin Donnelly wrote:
> s/payments/Payments/

Done.

https://codereview.chromium.org/2068653003/diff/20001/chrome/browser/resource...
chrome/browser/resources/settings/people_page/sync_page.js:178:
this.set('syncPrefs.paymentsIntegrationEnabled', false);
On 2016/06/14 19:56:41, Justin Donnelly wrote:
> I think there may be an opportunity to fix https://crbug.com/609087 if we
> *don't* do this. Let's discuss offline.

Acknowledged. Deferred to a different patch / discussion.

[Justin Donnelly, 2016-06-14 22:30:55]

lgtm

[tommycli, 2016-06-14 22:35:55]

thanks!

[tommycli, 2016-06-14 22:53:58]

The CQ bit was checked by tommycli@chromium.org

[commit-bot: I haz the power, 2016-06-14 22:54:30]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2068653003/60001

[commit-bot: I haz the power, 2016-06-14 23:45:47]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-14 23:45:48]

Try jobs failed on following builders:
  linux_chromium_rel_ng on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[tommycli, 2016-06-15 16:33:56]

The CQ bit was checked by tommycli@chromium.org

[tommycli, 2016-06-15 16:33:57]

The patchset sent to the CQ was uploaded after l-g-t-m from
jdonnelly@chromium.org
Link to the patchset: https://codereview.chromium.org/2068653003/#ps80001
(title: "update browsertest")

[commit-bot: I haz the power, 2016-06-15 16:34:21]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2068653003/80001

[commit-bot: I haz the power, 2016-06-15 17:21:11]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-15 17:21:12]

Try jobs failed on following builders:
  linux_android_rel_ng on tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)

[tommycli, 2016-06-15 22:09:35]

The CQ bit was checked by tommycli@chromium.org

[commit-bot: I haz the power, 2016-06-15 22:10:05]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2068653003/80001

[commit-bot: I haz the power, 2016-06-16 01:11:28]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-16 01:11:31]

Failed to apply patch for
chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc:
While running git apply --index -3 -p1;
  error: patch failed:
chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc:760
  Falling back to three-way merge...
  Applied patch to
'chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc'
with conflicts.
  U chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Patch:      
chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
Index:
chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
diff --git
a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
index
1d18f9453628f2bce12a9edf5ef8c32919732819..7550648260124651a095087951ac5bbbaf0d9e4f
100644
--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -20,6 +20,7 @@
 #include "chrome/grit/settings_chromium_strings.h"
 #include "chrome/grit/settings_google_chrome_strings.h"
 #include "chrome/grit/settings_strings.h"
+#include "components/autofill/core/common/autofill_constants.h"
 #include "components/google/core/browser/google_util.h"
 #include
"components/password_manager/core/browser/password_manager_constants.h"
 #include "content/public/browser/web_ui_data_source.h"
@@ -760,6 +761,8 @@ void AddPeopleStrings(content::WebUIDataSource* html_source)
{
     {"bookmarksCheckboxLabel", IDS_SETTINGS_BOOKMARKS_CHECKBOX_LABEL},
     {"passwordsCheckboxLabel", IDS_SETTINGS_PASSWORDS_CHECKBOX_LABEL},
     {"openTabsCheckboxLabel", IDS_SETTINGS_OPEN_TABS_CHECKBOX_LABEL},
+    {"enablePaymentsIntegrationCheckboxLabel",
+     IDS_SETTINGS_ENABLE_PAYMENTS_INTEGRATION_CHECKBOX_LABEL},
     {"encryptionOptionsTitle", IDS_SETTINGS_ENCRYPTION_OPTIONS},
     {"syncDataEncryptedText", IDS_SETTINGS_SYNC_DATA_ENCRYPTED_TEXT},
     {"encryptWithGoogleCredentialsLabel",
@@ -785,6 +788,7 @@ void AddPeopleStrings(content::WebUIDataSource* html_source)
{
   AddLocalizedStringsBulk(html_source, localized_strings,
                           arraysize(localized_strings));
 
+  html_source->AddString("autofillHelpURL", autofill::kHelpURL);
   html_source->AddString("supervisedUsersUrl",
                          chrome::kLegacySupervisedUserManagementURL);
   std::string disconnect_help_url =

[commit-bot: I haz the power, 2016-06-16 01:11:43]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-16 01:11:44]

CQ bit was unchecked

[tommycli, 2016-06-16 16:44:09]

The CQ bit was checked by tommycli@chromium.org

[tommycli, 2016-06-16 16:44:10]

The patchset sent to the CQ was uploaded after l-g-t-m from
jdonnelly@chromium.org
Link to the patchset: https://codereview.chromium.org/2068653003/#ps100001
(title: "merge")

[commit-bot: I haz the power, 2016-06-16 16:44:53]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2068653003/100001

[commit-bot: I haz the power, 2016-06-16 17:58:29]

Description was changed from

==========
Settings People Revamp: Add Payments integration to new Sync Settings.

Very similar to this patch: https://codereview.chromium.org/1578173005/

It adds Payments integration to the new MD Settings just like the it
was added to the old Options implementation in Jan 2016.

BUG=608492, 563721
TEST=MANUAL
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation
==========

to

==========
Settings People Revamp: Add Payments integration to new Sync Settings.

Very similar to this patch: https://codereview.chromium.org/1578173005/

It adds Payments integration to the new MD Settings just like the it
was added to the old Options implementation in Jan 2016.

BUG=608492, 563721
TEST=MANUAL
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation
==========

[commit-bot: I haz the power, 2016-06-16 17:58:30]

Committed patchset #6 (id:100001)

[commit-bot: I haz the power, 2016-06-16 18:00:35]

Description was changed from

==========
Settings People Revamp: Add Payments integration to new Sync Settings.

Very similar to this patch: https://codereview.chromium.org/1578173005/

It adds Payments integration to the new MD Settings just like the it
was added to the old Options implementation in Jan 2016.

BUG=608492, 563721
TEST=MANUAL
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation
==========

to

==========
Settings People Revamp: Add Payments integration to new Sync Settings.

Very similar to this patch: https://codereview.chromium.org/1578173005/

It adds Payments integration to the new MD Settings just like the it
was added to the old Options implementation in Jan 2016.

BUG=608492, 563721
TEST=MANUAL
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation

Committed: https://crrev.com/3a5ea77b5636b462910521845296eeb16b8f7403
Cr-Commit-Position: refs/heads/master@{#400199}
==========

[commit-bot: I haz the power, 2016-06-16 18:00:36]

Patchset 6 (id:??) landed as
https://crrev.com/3a5ea77b5636b462910521845296eeb16b8f7403
Cr-Commit-Position: refs/heads/master@{#400199}