Sync: Refactor the ProfileSyncService and sync setup flow to remove use of WebUI from PSS.

chrome/browser/ui/webui/options/sync_setup_handler.cc

Index: chrome/browser/ui/webui/options/sync_setup_handler.cc
diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.cc b/chrome/browser/ui/webui/options/sync_setup_handler.cc
index 4193c2947b41ab4228c066742a41bb4e9fe915d4..2c2132cdb0f5cfb2da3f408c3c85ae942b7cd5ca 100644
--- a/chrome/browser/ui/webui/options/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/options/sync_setup_handler.cc
@@ -275,6 +275,8 @@ void SyncSetupHandler::RegisterMessages() {
       NewCallback(this, &SyncSetupHandler::HandlePassphraseCancel));
   web_ui_->RegisterMessageCallback("SyncSetupAttachHandler",
       NewCallback(this, &SyncSetupHandler::HandleAttachHandler));
+  web_ui_->RegisterMessageCallback("SyncSetupShowErrorUI",
+      NewCallback(this, &SyncSetupHandler::HandleShowErrorUI));
 }
 
 void SyncSetupHandler::ShowGaiaLogin(const DictionaryValue& args) {
@@ -397,6 +399,7 @@ void SyncSetupHandler::HandlePassphraseCancel(const ListValue* args) {
   flow_->OnPassphraseCancel();
 }
 
+// TODO(jhawkins): Too much logic going on in this method: refactor.
 void SyncSetupHandler::HandleAttachHandler(const ListValue* args) {
   DCHECK(web_ui_);
 
@@ -410,21 +413,30 @@ void SyncSetupHandler::HandleAttachHandler(const ListValue* args) {
     return;
   }
 
-  if (sync_service->get_wizard().IsVisible()) {
-    // The wizard and setup flow have been configured, all we need to do is
-    // attach the handler if we haven't already done so.
-    if (!flow_)
-      flow_ = sync_service->get_wizard().AttachSyncSetupHandler(this);
-    return;
-  }
+  SyncSetupWizard::State state;
 
   // The user is trying to manually load a syncSetup URL.  We should bring up
   // either a login or a configure flow based on the state of sync.
-  if (sync_service->HasSyncSetupCompleted()) {
-    sync_service->ShowConfigure(web_ui_, false);
-  } else {
-    sync_service->ShowLoginDialog(web_ui_);
-    ProfileSyncService::SyncEvent(ProfileSyncService::START_FROM_URL);
+  if (sync_service->HasSyncSetupCompleted())
+    state = SyncSetupWizard::CONFIGURE;
+  else
+    state = SyncSetupWizard::GAIA_LOGIN;
+
+  if (!flow_) {
+    sync_service->get_wizard().Step(state);

[binji, 2011/06/08 20:19:56]

This logic seems strange to me. Why do you have to step the state and then
advance to the same state?

[James Hawkins, 2011/06/08 22:33:39]

Indeed, though I'd like to change that in a separate CL.

[tim (not reviewing), 2011/06/09 14:50:36]

But how is this not broken? Shouldn't we just yank the call to Advance
altogether?  The flow is a part of the wizard, not the other way around, pretty
sneaky / circuitous to get it via the service.

+    flow_ = sync_service->get_wizard().AttachSyncSetupHandler(this);
   }
+
+  flow_->Advance(state);
 }
 
+void SyncSetupHandler::HandleShowErrorUI(const ListValue* args) {
+  if (!flow_) {
+    ProfileSyncService* service =
+        web_ui_->GetProfile()->GetProfileSyncService();
+    service->get_wizard().Step(SyncSetupWizard::NONFATAL_ERROR);
+    flow_ = service->get_wizard().AttachSyncSetupHandler(this);
+  }
+
+  flow_->Advance(SyncSetupWizard::NONFATAL_ERROR);
+}