Handle refresh on sync setup page.

chrome/browser/ui/webui/sync_promo/sync_promo_handler.cc

Index: chrome/browser/ui/webui/sync_promo/sync_promo_handler.cc
diff --git a/chrome/browser/ui/webui/sync_promo/sync_promo_handler.cc b/chrome/browser/ui/webui/sync_promo/sync_promo_handler.cc
index c4dc04f9c5d4a119a8ecdec839edb633d41b2991..25306df345c400d4219423a70403afd53a348a11 100644
--- a/chrome/browser/ui/webui/sync_promo/sync_promo_handler.cc
+++ b/chrome/browser/ui/webui/sync_promo/sync_promo_handler.cc
@@ -209,12 +209,15 @@ void SyncPromoHandler::HandleCloseSyncPromo(const base::ListValue* args) {
 }
 
 void SyncPromoHandler::HandleInitializeSyncPromo(const base::ListValue* args) {
-  // If this is a page reload, then we have to inform the login service
-  // the old UI closed. If this is an initial load, this call will do nothing.
-  GetLoginUIService()->LoginUIClosed(this);

[Evan Stade, 2012/08/11 00:36:12]

the code was calling ShowSetupUI (which called OpenSyncSetup), then Initialize
(this function). Therefore we called: OpenSyncSetup, LoginUIClosed,
OpenSyncSetup. This broke the identity api (the only subscriber to
OnLoginUIClosed).

+  if (IsActiveLogin()) {
+    // Page has been reloaded. We don't need to do initialization of the setup
+    // handler but we do have to refresh the page.
+    DisplayGaiaLogin(false);

[Andrew T Wilson (Slow), 2012/08/11 01:10:33]

Hmmm. Is this the correct thing to do here? I'm concerned about the case where:

1) The user has a custom passphrase set for his acct.
2) He logs in to the promo
3) He is presented with the "advanced" sync setup page to enter his custom
passphrase
4) He hits reload.

Not sure what happens in this case if you call DisplayGaiaLogin(false). The user
is in a signed-in state so displaying a login seems like the wrong thing (note
the code in SyncSetupHandler::OpenSyncSetup() that displays different UI
depending on the current state of sync - you are bypassing this code by calling
DisplayGaiaLogin() directly).

It feels like the right thing to do is always call OpenSyncSetup(true) as the
code was doing before - I don't quite understand what the fail case is.

[Evan Stade, 2012/08/11 01:28:55]

that code always displays the gaia login when force_login is true, as it is
below. The difference is that OpenSyncSetup frequently does nothing (it only
works the first time you call it).

I just tested the scenario you suggested by adding a custom passphrase to my
test account, signing out and trying to sign back in with chrome://signin. When
I reloaded on the advanced page, it dumped me back to the login page with my
username filled in but the password field blank. This seems reasonable and it is
the same thing that happens when I sign in via chrome://settings, but reload
before configuring.
When you reload, OpenSyncSetup(true) does nothing because PrepareSyncSetup
returns false.

+  } else {
+    // Do setup and show the login page.
+    OpenSyncSetup(true);
+  }
 
-  // Open the sync wizard to the login screen.
-  OpenSyncSetup(true);
   // We don't need to compute anything for this, just do this every time.
   RecordUserFlowAction(SYNC_PROMO_VIEWED);
   // Increment view count first and show natural numbers in stats rather than 0