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

chrome/browser/sync/sync_setup_wizard.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_SYNC_SETUP_WIZARD_H_
 #define CHROME_BROWSER_SYNC_SYNC_SETUP_WIZARD_H_
 #pragma once
 
 #include "base/basictypes.h"
 
@@ skipping 16 matching lines @@
     // Show the screen that lets you configure sync.
     // There are two tabs:
     //  Data Types --
     //   Choose either "Keep everything synced" or
     //   "Choose which data types to sync", and checkboxes for each data type.
     //  Encryption --
     //   Choose what to encrypt and whether to use a passphrase.
     CONFIGURE,
     // Show the screen that prompts for your passphrase
     ENTER_PASSPHRASE,
-    // The panic switch.  Something went terribly wrong during setup and we
-    // can't recover.
+    // An error has occurred in the backend. The next appropriate step is picked
+    // based on which error has occurred.
+    NONFATAL_ERROR,
+    // The panic switch. Something went terribly wrong during setup and we can't
+    // recover.
     FATAL_ERROR,
     // The client can't set up sync at the moment due to a concurrent operation
     // to clear cloud data being in progress on the server.
     SETUP_ABORTED_BY_PENDING_CLEAR,
-    // Loading screen with spinny throbber.
+    // Loading screen with throbber.
     SETTING_UP,
     // A catch-all done case for any setup process.
     DONE
   };
 
   explicit SyncSetupWizard(ProfileSyncService* service);
   ~SyncSetupWizard();
 
   // Advances the wizard to the specified state if possible, or opens a
   // new dialog starting at |advance_state|.  If the wizard has never ran
   // through to completion, it will always attempt to do so.  Otherwise, e.g
   // for a transient auth failure, it will just run as far as is necessary
   // based on |advance_state| (so for auth failure, up to GAIA_SUCCESS).
   void Step(State advance_state);
 
   // Whether or not a dialog is currently showing.  Useful to determine
   // if various buttons in the UI should be enabled or disabled.
   bool IsVisible() const;
 
   // Focus the dialog if it is already open.  Does nothing if the dialog is
   // not visible.
   void Focus();
 
+  // TODO(jhawkins): Refactor to take a State parameter and handle the call to
+  // Step() as well as hooking up the handler.
   SyncSetupFlow* AttachSyncSetupHandler(SyncSetupFlowHandler* handler);
 
  private:
   // If we just need to pop open an individual dialog, say to collect
   // gaia credentials in the event of a steady-state auth failure, this is
   // a "discrete" run (as in not a continuous wizard flow).  This returns
   // the end state to pass to Run for a given |start_state|.
   static State GetEndStateForDiscreteRun(State start_state);
 
   // Helper to return whether |state| warrants starting a new flow.
   static bool IsTerminalState(State state);
 
   ProfileSyncService* service_;
 
   SyncSetupFlowContainer* flow_container_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncSetupWizard);
 };
 
 #endif  // CHROME_BROWSER_SYNC_SYNC_SETUP_WIZARD_H_