Move Autofill Payments integration checkbox to the sync settings page.

chrome/browser/resources/options/sync_setup_overlay.js

 // Copyright (c) 2012 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.
 
 cr.exportPath('options');
 
 /** @typedef {{appsEnforced: boolean,
  *             appsRegistered: boolean,
  *             appsSynced: boolean,
  *             autofillEnforced: boolean,
  *             autofillRegistered: boolean,
  *             autofillSynced: boolean,
  *             bookmarksEnforced: boolean,
  *             bookmarksRegistered: boolean,
  *             bookmarksSynced: boolean,
  *             encryptAllData: boolean,
  *             encryptAllDataAllowed: boolean,
  *             enterGooglePassphraseBody: (string|undefined),
  *             enterPassphraseBody: (string|undefined),
  *             extensionsEnforced: boolean,
  *             extensionsRegistered: boolean,
  *             extensionsSynced: boolean,
  *             fullEncryptionBody: string,
  *             passphraseFailed: boolean,
  *             passwordsEnforced: boolean,
  *             passwordsRegistered: boolean,
  *             passwordsSynced: boolean,
+ *             paymentsIntegrationEnabled: boolean,
  *             preferencesEnforced: boolean,
  *             preferencesRegistered: boolean,
  *             preferencesSynced: boolean,
  *             showPassphrase: boolean,
  *             syncAllDataTypes: boolean,
  *             syncNothing: boolean,
  *             tabsEnforced: boolean,
  *             tabsRegistered: boolean,
  *             tabsSynced: boolean,
  *             themesEnforced: boolean,
@@ skipping 114 matching lines @@
       };
       $('stop-syncing-ok').onclick = function() {
         var deleteProfile = $('delete-profile') != undefined &&
             $('delete-profile').checked;
         chrome.send('SyncSetupStopSyncing', [deleteProfile]);
         self.closeOverlay_();
       };
       $('use-default-link').onclick = function() {
         self.showSyncEverythingPage_();
       };
+      $('autofill-checkbox').onclick = function() {
+        self.paymentsIntegrationAvailableStateChanged_(
+            $('autofill-checkbox').checked);
+      };
     },
 
     /** @private */
     showOverlay_: function() {
       PageManager.showPageByName('syncSetup');
     },
 
     /** @private */
     closeOverlay_: function() {
       this.syncConfigureArgs_ = null;
@@ skipping 151 matching lines @@
       // configuration to the backend.
       this.setInputElementsDisabledState_(true);
       $('use-default-link').hidden = true;
 
       // These values need to be kept in sync with where they are read in
       // sync_setup_handler.cc:GetConfiguration().
       var syncAll = $('sync-select-datatypes').selectedIndex ==
                     options.DataTypeSelection.SYNC_EVERYTHING;
       var syncNothing = $('sync-select-datatypes').selectedIndex ==
                         options.DataTypeSelection.SYNC_NOTHING;
+      var autofillSynced = syncAll || $('autofill-checkbox').checked;
       var result = JSON.stringify({
         'syncAllDataTypes': syncAll,
         'syncNothing': syncNothing,
         'bookmarksSynced': syncAll || $('bookmarks-checkbox').checked,
         'preferencesSynced': syncAll || $('preferences-checkbox').checked,
         'themesSynced': syncAll || $('themes-checkbox').checked,
         'passwordsSynced': syncAll || $('passwords-checkbox').checked,
-        'autofillSynced': syncAll || $('autofill-checkbox').checked,
+        'autofillSynced': autofillSynced,
         'extensionsSynced': syncAll || $('extensions-checkbox').checked,
         'typedUrlsSynced': syncAll || $('typed-urls-checkbox').checked,
         'appsSynced': syncAll || $('apps-checkbox').checked,
         'tabsSynced': syncAll || $('tabs-checkbox').checked,
-        'wifiCredentialsSynced': syncAll ||
-                                 $('wifi-credentials-checkbox').checked,
+        'wifiCredentialsSynced':
+            syncAll || $('wifi-credentials-checkbox').checked,
+        'paymentsIntegrationEnabled':
+            autofillSynced && $('payments-integration-checkbox').checked,
         'encryptAllData': encryptAllData,
         'usePassphrase': usePassphrase,
         'isGooglePassphrase': googlePassphrase,
         'passphrase': customPassphrase
       });
       chrome.send('SyncSetupConfigure', [result]);
     },
 
     /**
      * Sets the disabled property of all input elements within the 'Customize
@@ skipping 57 matching lines @@
         $('passwords-item').hidden = false;
       } else {
         $('passwords-item').hidden = true;
       }
       if (args.autofillRegistered) {
         $('autofill-checkbox').checked = args.autofillSynced;
         this.dataTypeBoxesChecked_['autofill-checkbox'] = args.autofillSynced;
         this.dataTypeBoxesDisabled_['autofill-checkbox'] =
             args.autofillEnforced;
         $('autofill-item').hidden = false;
+        $('payments-integration-setting-area').hidden = false;
+        $('payments-integration-checkbox').checked =
+            args.autofillSynced && args.paymentsIntegrationEnabled;
+        $('payments-integration-checkbox').disabled = !args.autofillSynced;
       } else {
         $('autofill-item').hidden = true;
+        $('payments-integration-setting-area').hidden = true;
       }
       if (args.extensionsRegistered) {
         $('extensions-checkbox').checked = args.extensionsSynced;
         this.dataTypeBoxesChecked_['extensions-checkbox'] =
             args.extensionsSynced;
         this.dataTypeBoxesDisabled_['extensions-checkbox'] =
             args.extensionsEnforced;
         $('extensions-item').hidden = false;
       } else {
         $('extensions-item').hidden = true;
@@ skipping 395 matching lines @@
       chrome.send('SyncSetupStartSignIn', [accessPoint]);
     },
 
     /**
      * Forces user to sign out of Chrome for Chrome OS.
      * @private
      */
     doSignOutOnAuthError_: function() {
       chrome.send('SyncSetupDoSignOutOnAuthError');
     },
+
+    /**
+     * Toggles the visibility of the Payments integration checkbox.

[please use gerrit instead, 2016/01/15 17:05:32]

Would this wording be better?

s/visibility/enabled-disabled state/

[Justin Donnelly, 2016/01/15 17:15:35]

Oops, yeah, I copied this from the autofill settings code and didn't update this
comment to reflect the change in behavior.

Since this function is only called from one place now I've just inlined the code
and removed the function.

+     * @param {boolean} available Whether the user has the option of using
+     *     Payments data.
+     * @private
+     */
+    paymentsIntegrationAvailableStateChanged_: function(available) {
+      $('payments-integration-checkbox').checked = available;
+      $('payments-integration-checkbox').disabled = !available;
+    },
   };
 
   // Forward public APIs to private implementations.
   cr.makePublic(SyncSetupOverlay, [
     'closeOverlay',
     'showSetupUI',
     'startSignIn',
     'doSignOutOnAuthError',
     'showSyncSetupPage',
     'showCustomizePage',
     'showStopSyncingUI',
   ]);
 
   // Export
   return {
     SyncSetupOverlay: SyncSetupOverlay
   };
 });