[Sync Setup UI] Separate stepping the SyncSetupWizard from syncSetup page navigation.

chrome/browser/ui/webui/sync_setup_handler.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/ui/webui/sync_setup_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 663 matching lines @@
 
   service->ShowErrorUI();
 }
 
 void SyncSetupHandler::HandleShowSetupUI(const ListValue* args) {
   DCHECK(!flow_);
   if (FocusExistingWizard()) {
     CloseOverlay();
     return;
   }
+
+  StepWizardForShowSetupUI();
   ShowSetupUI();
 }
 
 void SyncSetupHandler::CloseSyncSetup() {
   if (flow_) {
     flow_->OnDialogClosed(std::string());
     flow_ = NULL;
   }
 }
 
@@ skipping 11 matching lines @@
     return;
   }
 
   // If the wizard is already visible, it must be attached to another flow
   // handler.
   if (FocusExistingWizard()) {
     CloseOverlay();
     return;
   }
 
+  // The wizard must be stepped before attaching. Allow subclasses to step the
+  // wizard to appropriate state.
+  StepWizardForShowSetupUI();
+
   // Attach this as the sync setup handler, before calling ShowSetupUI().
   if (!service->get_wizard().AttachSyncSetupHandler(this)) {
     LOG(ERROR) << "SyncSetupHandler attach failed!";
     CloseOverlay();
     return;
   }
 
   ShowSetupUI();
 }
 
@@ skipping 45 matching lines @@
 }
 
 void SyncSetupHandler::ShowLoginErrorMessage(const string16& error_message) {
   DictionaryValue args;
   Profile* profile = Profile::FromWebUI(web_ui_);
   ProfileSyncService* service = profile->GetProfileSyncService();
   SyncSetupFlow::GetArgsForGaiaLogin(service, &args);
   args.SetString("error_message", error_message);
   ShowGaiaLogin(args);
 }