Sync: Refactor the ProfileSyncService and sync setup flow to remove use of WebUI from PSS.

chrome/browser/resources/options/sync_setup_overlay.js

 // Copyright (c) 2011 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.define('options', function() {
   const OptionsPage = options.OptionsPage;
 
   // Variable to track if a captcha challenge was issued. If this gets set to
   // true, it stays that way until we are told about successful login from
   // the browser.  This means subsequent errors (like invalid password) are
@@ skipping 251 matching lines @@
      * @private
      */
     setInputElementsDisabledState_: function(disabled) {
       var configureElements =
           $('customize-sync-preferences').querySelectorAll('input');
       for (var i = 0; i < configureElements.length; i++)
         configureElements[i].disabled = disabled;
     },
 
     setChooseDataTypesCheckboxes_: function(args) {
-      // If this frame is on top, the focus should be on it, so pressing enter
-      // submits this form.
-      if (args.iframeToShow == 'configure') {
-        $('choose-datatypes-ok').focus();
-      }
-
       var datatypeSelect = document.getElementById('sync-select-datatypes');
       datatypeSelect.selectedIndex = args.keepEverythingSynced ? 0 : 1;
 
       $('bookmarks-checkbox').checked = args.syncBookmarks;
       $('preferences-checkbox').checked = args.syncPreferences;
       $('themes-checkbox').checked = args.syncThemes;
 
       if (args.passwordsRegistered) {
         $('passwords-checkbox').checked = args.syncPasswords;
         $('passwords-item').className = "sync-item-show";
@@ skipping 64 matching lines @@
       $('choose-datatypes-ok').disabled = true;
     },
 
     setCheckboxesAndErrors_: function(args) {
       this.setChooseDataTypesCheckboxes_(args);
       this.setEncryptionRadios_(args);
       this.setPassphraseRadios_(args);
       this.setErrorState_(args);
     },
 
-    // Called once, when this html/js is loaded.
     showConfigure_: function(args) {
       var datatypeSelect = document.getElementById('sync-select-datatypes');
       var self = this;
       datatypeSelect.onchange = function() {
         var syncAll = this.selectedIndex == 0;
         self.setCheckboxesToKeepEverythingSynced_(syncAll);
       };
 
       this.resetPage_('sync-setup-configure');
       $('sync-setup-configure').hidden = false;
@@ skipping 76 matching lines @@
 
       $('sync-custom-passphrase-container').hidden = false;
       $('sync-existing-passphrase-container').hidden = true;
 
       // If the user has selected the 'Customize' page on initial set up, it's
       // likely he intends to change the data types. Select the
       // 'Choose data types' option in this case.
       var index = syncEverything ? 0 : 1;
       document.getElementById('sync-select-datatypes').selectedIndex = index;
       this.setDataTypeCheckboxesEnabled_(!syncEverything);
+
+      // The passphrase input may need to take over focus from the OK button, so
+      // set focus before that logic.
       $('choose-datatypes-ok').focus();
 
       if (args && args['show_passphrase'])
         this.showPassphraseContainer_(args);
     },
 
     attach_: function() {
       chrome.send('SyncSetupAttachHandler');
     },
 
@@ skipping 224 matching lines @@
 
     showSuccessAndClose_: function() {
       $('sign-in').value = localStrings.getString('loginSuccess');
       setTimeout(this.closeOverlay_, 1600);
     },
 
     showSuccessAndSettingUp_: function() {
       $('sign-in').value = localStrings.getString('settingUp');
     },
 
-    /** @inheritDoc */
-    shouldClose: function() {
-      if (!$('cancel-warning-box').hidden) {
-        chrome.send('SyncSetupPassphraseCancel', ['']);
-        return true;
-      } else if (!$('sync-setup-passphrase').hidden) {
-        // The Passphrase page is showing, and the use has pressed escape.
-        // Activate the cancel logic in this case.
-        this.showCancelWarning_();
-        return false;
-      }
+    /**
+     * Initiates attachment to the Sync setup flow and steps into the
+     * appropriate error UI.
+     * @private
+     */
+    showErrorUI_: function() {
+      this.attach_();
+      chrome.send('SyncSetupShowErrorUI');
+    },
+  };
 
-      return true;
-    },
+  SyncSetupOverlay.showErrorUI = function() {
+    SyncSetupOverlay.getInstance().showErrorUI_();
   };
 
   SyncSetupOverlay.showSyncDialog = function() {
     SyncSetupOverlay.getInstance().attach_();
   };
 
   SyncSetupOverlay.showSyncSetupPage = function(page, args) {
     SyncSetupOverlay.getInstance().showSyncSetupPage_(page, args);
   };
 
   SyncSetupOverlay.showSuccessAndClose = function() {
     SyncSetupOverlay.getInstance().showSuccessAndClose_();
   };
 
   SyncSetupOverlay.showSuccessAndSettingUp = function() {
     SyncSetupOverlay.getInstance().showSuccessAndSettingUp_();
   };
 
   // Export
   return {
     SyncSetupOverlay: SyncSetupOverlay
   };
 });