Move UI specific implementation from ProfileSyncService to SyncSetupFlowHandler.

chrome/browser/sync/profile_sync_service.cc

 // 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.
 
 #include "chrome/browser/sync/profile_sync_service.h"
 
 #include <stddef.h>
 #include <map>
 #include <ostream>
 #include <set>
@@ skipping 802 matching lines @@
     wizard_.Step(SyncSetupWizard::GAIA_LOGIN);
     return;
   }
 
   if (!auth_error_time_.is_null()) {
     UMA_HISTOGRAM_LONG_TIMES("Sync.ReauthorizationTime",
                              base::TimeTicks::Now() - auth_error_time_);
     auth_error_time_ = base::TimeTicks();  // Reset auth_error_time_ to null.
   }
 
-  ShowSyncSetup(SyncSetupWizard::GAIA_LOGIN);
+  wizard_.ShowSyncSetup(SyncSetupWizard::GAIA_LOGIN);
 
   NotifyObservers();
 }
 
 void ProfileSyncService::ShowErrorUI() {
-  if (WizardIsVisible()) {
-    wizard_.Focus();
-    return;
-  }
-
-  ShowSyncSetup(SyncSetupWizard::NONFATAL_ERROR);
+  wizard_.ShowSyncSetup(SyncSetupWizard::NONFATAL_ERROR);

[Andrew T Wilson (Slow), 2011/07/11 18:12:51]

Now that these methods are basically just dumb wrappers for SyncSetupWizard
APIs, one thing I think we should do (in a separate CL, not this one :) is
remove these routines and have callers call directly into the wizard instead.

I'm not 100% sure, so this is fine for now.

 }
 
 void ProfileSyncService::ShowConfigure(bool sync_everything) {
-  if (WizardIsVisible()) {
-    wizard_.Focus();
-    return;
-  }
-
   if (sync_everything)
-    ShowSyncSetup(SyncSetupWizard::SYNC_EVERYTHING);
+    wizard_.ShowSyncSetup(SyncSetupWizard::SYNC_EVERYTHING);
   else
-    ShowSyncSetup(SyncSetupWizard::CONFIGURE);
+    wizard_.ShowSyncSetup(SyncSetupWizard::CONFIGURE);
 }
 
 void ProfileSyncService::PromptForExistingPassphrase() {
-  if (WizardIsVisible()) {
-    wizard_.Focus();
-    return;
-  }
-
-  ShowSyncSetup(SyncSetupWizard::ENTER_PASSPHRASE);
-}
-
-void ProfileSyncService::ShowSyncSetup(SyncSetupWizard::State state) {
-  wizard_.Step(state);
-  BrowserList::GetLastActiveWithProfile(profile())->ShowOptionsTab(
-      chrome::kSyncSetupSubPage);
+  wizard_.ShowSyncSetup(SyncSetupWizard::ENTER_PASSPHRASE);
 }
 
 SyncBackendHost::StatusSummary ProfileSyncService::QuerySyncStatusSummary() {
   if (backend_.get() && backend_initialized_)
     return backend_->GetStatusSummary();
   else
     return SyncBackendHost::Status::OFFLINE_UNUSABLE;
 }
 
 SyncBackendHost::Status ProfileSyncService::QueryDetailedSyncStatus() {
@@ skipping 526 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;
 }