Revert 50902 - New HTML Sync Setup UI....

chrome/browser/sync/sync_setup_wizard.h

 // Copyright (c) 2006-2008 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_
 
 #include "base/basictypes.h"
 
 class SyncSetupFlowContainer;
 
 class ProfileSyncService;
 
 class SyncSetupWizard {
  public:
   enum State {
     // Show the Google Account login UI.
     GAIA_LOGIN = 0,
-    // A login attempt succeeded.  This will wait for an explicit transition
-    // (via Step) to the next state.
+    // A login attempt succeeded.  Depending on initial conditions, this may
+    // cause a transition to DONE, or to wait for an explicit transition (via
+    // Step) to the next state.
     GAIA_SUCCESS,
-    // Show the screen that lets you click either "Keep everything synced" or
-    // "Choose which data types to sync", and checkboxes for each data type.
-    CHOOSE_DATA_TYPES,
-    // Show the screen that lets you create a passphrase (if you've never set
-    // one up before).
-    CREATE_PASSPHRASE,
-    // Show the screen that lets you enter the passphrase (if you've set one up
-    // on another machine).
-    ENTER_PASSPHRASE,
-    // Show the screen that lets you reset your passphrase (if you forgot it).
-    RESET_PASSPHRASE,
     // The panic switch.  Something went terribly wrong during setup and we
     // can't recover.
     FATAL_ERROR,
     // A final state for when setup completes and it is possible it is the
     // user's first time (globally speaking) as the cloud doesn't have any
     // bookmarks.  We show additional info in this case to explain setting up
     // more computers.
     DONE_FIRST_TIME,
     // A catch-all done case for any setup process.
     DONE
@@ skipping 22 matching lines @@
   // 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_;
 
+  // The use of ShowHtmlDialog and SyncSetupFlowContainer is disabled on Linux
+  // until BrowserShowHtmlDialog() is implemented.
+  // See: http://code.google.com/p/chromium/issues/detail?id=25260
   SyncSetupFlowContainer* flow_container_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncSetupWizard);
 };
 
 #endif  // CHROME_BROWSER_SYNC_SYNC_SETUP_WIZARD_H_