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

chrome/browser/sync/profile_sync_service.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/sync/profile_sync_service.h"
 
 #include <map>
 #include <set>
 
 #include "app/l10n_util.h"
@@ skipping 176 matching lines @@
         browser_sync::StringToNotificationMethod(notification_method_str);
   }
 }
 
 void ProfileSyncService::RegisterPreferences() {
   PrefService* pref_service = profile_->GetPrefs();
   if (pref_service->FindPreference(prefs::kSyncLastSyncedTime))
     return;
   pref_service->RegisterInt64Pref(prefs::kSyncLastSyncedTime, 0);
   pref_service->RegisterBooleanPref(prefs::kSyncHasSetupCompleted, false);
-  pref_service->RegisterBooleanPref(prefs::kKeepEverythingSynced, false);
 
   // If you've never synced before, or if you're using Chrome OS, all datatypes
   // are on by default.
   // TODO(nick): Perhaps a better model would be to always default to false,
   // and explicitly call SetDataTypes() when the user shows the wizard.
 #if defined(OS_CHROMEOS)
   bool enable_by_default = true;
 #else
   bool enable_by_default =
       !pref_service->HasPrefPath(prefs::kSyncHasSetupCompleted);
@@ skipping 289 matching lines @@
     UMA_HISTOGRAM_LONG_TIMES("Sync.ReauthorizationTime",
                              base::TimeTicks::Now() - auth_error_time_);
     auth_error_time_ = base::TimeTicks();  // Reset auth_error_time_ to null.
   }
 
   if (last_auth_error_.state() != AuthError::NONE) {
     wizard_.Step(SyncSetupWizard::GAIA_LOGIN);
   }
 }
 
-void ProfileSyncService::ShowChooseDataTypes() {
-  if (WizardIsVisible()) {
-    wizard_.Focus();
-    return;
-  }
-
-  wizard_.Step(SyncSetupWizard::CHOOSE_DATA_TYPES);
-}
-
 SyncBackendHost::StatusSummary ProfileSyncService::QuerySyncStatusSummary() {
   if (backend_.get())
     return backend_->GetStatusSummary();
   else
     return SyncBackendHost::Status::OFFLINE_UNUSABLE;
 }
 
 SyncBackendHost::Status ProfileSyncService::QueryDetailedSyncStatus() {
   if (backend_.get()) {
     return backend_->GetDetailedStatus();
@@ skipping 53 matching lines @@
   }
   last_attempted_user_email_ = username;
   is_auth_in_progress_ = true;
   FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
 
   auth_start_time_ = base::TimeTicks::Now();
   backend_->Authenticate(username, password, captcha);
 }
 
 void ProfileSyncService::OnUserChoseDatatypes(bool sync_everything,
-    const syncable::ModelTypeSet& chosen_types) {
-  if (!backend_.get()) {
-    NOTREACHED();
-    return;
-  }
-  profile_->GetPrefs()->SetBoolean(prefs::kKeepEverythingSynced,
-      sync_everything);
-
-  ChangePreferredDataTypes(chosen_types);
-  profile_->GetPrefs()->ScheduleSavePersistentPrefs();
-
-  // If the backend has already started syncing, that's okay;
-  // SyncerThread::Start() checks if it's already running before starting.
-  backend_->StartSyncing();
-  // TODO(dantasse): pass the chosen_types parameter through to the backend
+    const syncable::ModelTypeSet& data_types) {
+  // TODO(dantasse): save sync_everything to prefs
+  // call StartSyncing(data_types)
+  // call ChangePreferredDataTypes(data_types)
 }
 
 void ProfileSyncService::OnUserCancelledDialog() {
   if (!profile_->GetPrefs()->GetBoolean(prefs::kSyncHasSetupCompleted)) {
     // A sync dialog was aborted before authentication.
     // Rollback.
     DisableForUser();
   }
 
   FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
@@ skipping 112 matching lines @@
       DataTypeManager::ConfigureResult result =
           *(Details<DataTypeManager::ConfigureResult>(details).ptr());
       if (result != DataTypeManager::OK) {
         OnUnrecoverableError(FROM_HERE, "Sync Configuration failed.");
         return;
       }
 
       // TODO(sync): Less wizard, more toast.
       wizard_.Step(SyncSetupWizard::DONE);
       FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
-
       break;
     }
     case NotificationType::SYNC_PASSPHRASE_REQUIRED: {
       // TODO(sync): Show the passphrase UI here.
       SetPassphrase("dummy passphrase");
       break;
     }
     case NotificationType::SYNC_PASSPHRASE_ACCEPTED: {
       // Make sure the data types that depend on the passphrase are started at
       // this time.
@@ skipping 33 matching lines @@
   // is initialized, all enabled data types are consistent with one
   // another, and no unrecoverable error has transpired.
   if (unrecoverable_error_detected_)
     return false;
 
   if (!data_type_manager_.get())
     return false;
 
   return data_type_manager_->state() == DataTypeManager::CONFIGURED;
 }