| Index: chrome/browser/sync/sync_setup_wizard.h
|
| diff --git a/chrome/browser/sync/sync_setup_wizard.h b/chrome/browser/sync/sync_setup_wizard.h
|
| index efaeff7e393fe685f2e7be3ecc1ca07b280cc957..fd2b153dde7ddc677dc820f582e509c4e0382d9b 100644
|
| --- a/chrome/browser/sync/sync_setup_wizard.h
|
| +++ b/chrome/browser/sync/sync_setup_wizard.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// 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.
|
|
|
| @@ -17,15 +17,6 @@ class ProfileSyncService;
|
| class SyncSetupWizard {
|
| public:
|
| enum State {
|
| - // Show the Google Account login UI.
|
| - GAIA_LOGIN = 0,
|
| - // Show the Gaia OAuth login UI.
|
| - // TODO(rickcam): After Sync with OAuth works, revisit removing this state.
|
| - OAUTH_LOGIN,
|
| - // A login attempt succeeded. This will wait for an explicit transition
|
| - // (via Step) to the next state.
|
| - GAIA_SUCCESS,
|
| - // Show the screen that confirms everything will be synced.
|
| SYNC_EVERYTHING,
|
| // Show the screen that lets you configure sync.
|
| // There are two tabs:
|
| @@ -37,20 +28,15 @@ class SyncSetupWizard {
|
| CONFIGURE,
|
| // Show the screen that prompts for your passphrase
|
| ENTER_PASSPHRASE,
|
| - // 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 throbber.
|
| SETTING_UP,
|
| // A catch-all done case for any setup process.
|
| DONE,
|
| - // Exit the wizard.
|
| + // Exit the wizard (for example, if the user clears the data on the
|
| + // dashboard while the wizard is open).
|
| ABORT,
|
| };
|
|
|
| @@ -68,10 +54,6 @@ class SyncSetupWizard {
|
| // if various buttons in the UI should be enabled or disabled.
|
| bool IsVisible() const;
|
|
|
| - // Returns either GAIA_LOGIN or OAUTH_LOGIN depending on which
|
| - // authentication scheme is in force.
|
| - static State GetLoginState();
|
| -
|
| // Focus the dialog if it is already open. Does nothing if the dialog is
|
| // not visible.
|
| void Focus();
|
|
|