Move UI specific implementation from ProfileSyncService to SyncSetupFlowHandler.

chrome/browser/ui/webui/options/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/options/sync_setup_handler.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_setup_flow.h"
+#include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using l10n_util::GetStringFUTF16;
 using l10n_util::GetStringUTF16;
 
@@ skipping 301 matching lines @@
 }
 
 void SyncSetupHandler::SetFlow(SyncSetupFlow* flow) {
   flow_ = flow;
 }
 
 void SyncSetupHandler::Focus() {
   static_cast<RenderViewHostDelegate*>(web_ui_->tab_contents())->Activate();
 }
 
+void SyncSetupHandler::ShowSyncSetup(Profile* profile) {

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

When you get rid of the Profile* parameter, you can get the profile from
web_ui_->GetProfile().

+  BrowserList::GetLastActiveWithProfile(profile)->ShowOptionsTab(
+      chrome::kSyncSetupSubPage);

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

csilv: Do we need to do anything else here to avoid the jank problem you ran
into, or is the code in SyncSetupWizard::ShowSyncSetup() that just calls Focus()
if the UI is already visible sufficient?

[qsr (NOT THE RIGHT qsr), 2011/07/12 07:01:37]

 Right now, I'm pretty sure I didn't change the behavior of anything. So it
should do exactly the same as before. If/When we start refactoring the flow,
then it would be necessary to review this.

+}
+
 void SyncSetupHandler::OnDidClosePage(const ListValue* args) {
   if (flow_) {
     flow_->OnDialogClosed(std::string());
     flow_ = NULL;
   }
 }
 
 void SyncSetupHandler::HandleSubmitAuth(const ListValue* args) {
   std::string json;
   if (!args->GetString(0, &json)) {
@@ skipping 125 matching lines @@
   // either a login or a configure flow based on the state of sync.
   if (service->HasSyncSetupCompleted())
     service->get_wizard().Step(SyncSetupWizard::CONFIGURE);
   else
     service->get_wizard().Step(SyncSetupWizard::GAIA_LOGIN);
 
   // Show the Sync Setup page.
   scoped_ptr<Value> page(Value::CreateStringValue("syncSetup"));
   web_ui_->CallJavascriptFunction("OptionsPage.navigateToPage", *page);
 }