Merge 182705

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 1119 matching lines @@
   if (!PrepareSyncSetup())
     return;
 
   // There are several different UI flows that can bring the user here:
   // 1) Signin promo (passes force_login=true)
   // 2) Normal signin through options page (GetAuthenticatedUsername() is
   //    empty).
   // 3) Previously working credentials have expired.
   // 4) User is already signed in, but App Notifications needs to force another
   //    login so it can fetch an oauth token (passes force_login=true)
-  // 5) User clicks [Advanced Settings] button on options page while already
+  // 5) User is signed in, but has stopped sync via the google dashboard, and
+  //    signout is prohibited by policy so we need to force a re-auth.
+  // 6) User clicks [Advanced Settings] button on options page while already
   //    logged in.
-  // 6) One-click signin (credentials are already available, so should display
+  // 7) One-click signin (credentials are already available, so should display
   //    sync configure UI, not login UI).
-  // 7) ChromeOS re-enable after disabling sync.
+  // 8) ChromeOS re-enable after disabling sync.
   SigninManager* signin = GetSignin();
   if (force_login ||
       signin->GetAuthenticatedUsername().empty() ||
+#if !defined(OS_CHROMEOS)
+      (GetSyncService() && GetSyncService()->IsStartSuppressed()) ||
+#endif
       signin->signin_global_error()->HasBadge()) {
     // User is not logged in, or login has been specially requested - need to
     // display login UI (cases 1-4).
     DisplayGaiaLogin(false);
   } else {
     if (!GetSyncService()) {
       // This can happen if the user directly navigates to /settings/syncSetup.
       DLOG(WARNING) << "Cannot display sync UI when sync is disabled";
       CloseOverlay();
       return;
@@ skipping 143 matching lines @@
     if (i != current_profile_index && AreUserNamesEqual(
         cache.GetUserNameOfProfileAtIndex(i), username_utf16)) {
       *error_message = l10n_util::GetStringUTF16(
           IDS_SYNC_USER_NAME_IN_USE_ERROR);
       return false;
     }
   }
 
   return true;
 }