Index: chrome/browser/sync/sync_setup_flow.h |
diff --git a/chrome/browser/sync/sync_setup_flow.h b/chrome/browser/sync/sync_setup_flow.h |
index 2338d6f01ce322a69ecfe43d2d154bc4c5e3a33f..c38db7e3380b02b6298051d6167f5e69e680e253 100644 |
--- a/chrome/browser/sync/sync_setup_flow.h |
+++ b/chrome/browser/sync/sync_setup_flow.h |
@@ -62,9 +62,6 @@ class SyncSetupFlow { |
SyncSetupWizard::State start, |
SyncSetupWizard::State end); |
- // Fills |args| with "user" and "error" arguments per our current state. |
- void GetArgsForGaiaLogin(DictionaryValue* args); |
- |
// Fills |args| for the configure screen (Choose Data Types/Encryption) |
void GetArgsForConfigure(DictionaryValue* args); |
@@ -82,13 +79,6 @@ class SyncSetupFlow { |
// obscured by a browser window. |
void Focus(); |
- void OnUserSubmittedAuth(const std::string& username, |
- const std::string& password, |
- const std::string& captcha, |
- const std::string& access_code); |
- |
- void OnUserSubmittedOAuth(const std::string& oauth1_request_token); |
- |
void OnUserConfigured(const SyncConfiguration& configuration); |
// The 'passphrase' screen is used when the user is prompted to enter |
@@ -113,7 +103,8 @@ class SyncSetupFlow { |
FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, |
DiscreteRunChooseDataTypesAbortedByPendingClear); |
FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, EnterPassphraseRequired); |
- FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, NonFatalError); |
+ FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, EnterPassphrase); |
+ FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, FatalErrorDuringConfigure); |
FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, CrosAuthSetup); |
FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, ShowErrorUIForPasswordTest); |
FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, ShowErrorUIForPassphraseTest); |
@@ -137,9 +128,6 @@ class SyncSetupFlow { |
SyncSetupWizard::State current_state_; |
SyncSetupWizard::State end_state_; // The goal. |
- // Time that the GAIA_LOGIN step was received. |
- base::TimeTicks login_start_time_; |
- |
// The handler needed for the entire flow. Weak reference. |
SyncSetupFlowHandler* flow_handler_; |
@@ -154,10 +142,6 @@ class SyncSetupFlow { |
// reflect this in the UI. |
bool user_tried_setting_passphrase_; |
- // Cache of the last name the client attempted to authenticate. |
- // TODO(atwilson): Move this out of here entirely and up into the UI layer. |
- std::string last_attempted_user_email_; |
- |
DISALLOW_COPY_AND_ASSIGN(SyncSetupFlow); |
}; |