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

chrome/browser/ui/webui/sync_promo_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_promo_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
@@ skipping 161 matching lines @@
         window_already_closed_ = true;
       }
       break;
     }
     default: {
       NOTREACHED();
     }
   }
 }
 
-void SyncPromoHandler::ShowSetupUI() {
+void SyncPromoHandler::StepWizardForShowSetupUI() {
   ProfileSyncService* service =
       Profile::FromWebUI(web_ui_)->GetProfileSyncService();
   service->get_wizard().Step(SyncSetupWizard::GetLoginState());
 }
 
+void SyncPromoHandler::ShowSetupUI() {
+  // We don't need to do anything here; The UI for the sync promo is already
+  // displayed.
+}
+
 void SyncPromoHandler::HandleCloseSyncPromo(const base::ListValue* args) {
   CloseSyncSetup();
 
   // If the user has signed in then set the pref to show them NTP bubble
   // confirming that they're signed in.
   std::string username = prefs_->GetString(prefs::kGoogleServicesUsername);
   if (!username.empty())
     prefs_->SetBoolean(prefs::kSyncPromoShowNTPBubble, true);
 
   GURL url = SyncPromoUI::GetNextPageURLForSyncPromoURL(
@@ skipping 76 matching lines @@
   int adjusted = GetViewCount() + amount;
   prefs_->SetInteger(prefs::kSyncPromoViewCount, adjusted);
   return adjusted;
 }
 
 void SyncPromoHandler::RecordUserFlowAction(int action) {
   // Send an enumeration to our single user flow histogram.
   UMA_HISTOGRAM_ENUMERATION("SyncPromo.UserFlow", action,
                             SYNC_PROMO_BUCKET_BOUNDARY);
 }