[sync] Hide "Sync nothing" UI; Go back to signing out on dashboard clears and abandoned initial set…

chrome/browser/ui/webui/sync_setup_handler.cc

 // Copyright (c) 2012 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/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 914 matching lines @@
       }
 
       // If the user clicked "Cancel" while setting up sync, disable sync
       // because we don't want the sync backend to remain in the initialized
       // state. Note: In order to disable sync across restarts on Chrome OS, we
       // must call OnStopSyncingPermanently(), which suppresses sync startup in
       // addition to disabling it.
       if (sync_service) {
         DVLOG(1) << "Sync setup aborted by user action";
         sync_service->OnStopSyncingPermanently();
+#if !defined(OS_CHROMEOS)
+        // Sign out the user on desktop Chrome if they click cancel during
+        // initial setup.
+        // TODO(rsimha): Revisit this for M30. See http://crbug.com/252049.
+        if (was_signing_in || sync_service->FirstSetupInProgress())

[Andrew T Wilson (Slow), 2013/06/20 21:49:37]

Not sure we should be checking was_signing_in here - what's the case where we
want to sign out the user even though FirstSetupInProgress() == false?

[Raghu Simha, 2013/06/26 21:48:15]

I don't believe there should be any case where FirstSetupInProgress() == false
and was_signing_in is true, and we still want to sign out the user. I included a
check for was_signing_in for 2 reasons:

1) I didn't want to let fall through the cracks, any case where was_signing_in
is true, but for some reason, FirstSetupInProgress() is not yet true. After
taking another look at the code, I noticed that we call SetSetupInProgress(true)
prior to displaying any sync setup UI (or cancel buttons), so we should be good
with the single check.
2) The original implementation (prior to r200867) was checking both conditions.
See line 1150 of the left half of 
https://codereview.chromium.org/14691004/diff/202002/chrome/browser/ui/webui/....

I've removed the check based on the above. Done.

+          SigninManagerFactory::GetForProfile(GetProfile())->SignOut();
+#endif
       }
     }
 
 #if !defined(OS_CHROMEOS)
     // Let the various services know that we're no longer active.
     CloseGaiaSigninPage();
 #endif
 
     GetLoginUIService()->LoginUIClosed(this);
   }
@@ skipping 145 matching lines @@
 }
 
 LoginUIService* SyncSetupHandler::GetLoginUIService() const {
   return LoginUIServiceFactory::GetForProfile(GetProfile());
 }
 
 void SyncSetupHandler::CloseOverlay() {
   CloseSyncSetup();
   web_ui()->CallJavascriptFunction("OptionsPage.closeOverlay");
 }