Allow signin to continue even if sync is disabled by policy.

chrome/browser/ui/webui/sync_promo/sync_promo_ui.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_promo/sync_promo_ui.h"
 
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/signin/signin_manager.h"
+#include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/webui/options/core_options_handler.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_handler.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_trial.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/url_data_source.h"
@@ skipping 83 matching lines @@
 bool SyncPromoUI::HasShownPromoAtStartup(Profile* profile) {
   return profile->GetPrefs()->HasPrefPath(prefs::kSyncPromoStartupCount);
 }
 
 // static
 bool SyncPromoUI::ShouldShowSyncPromo(Profile* profile) {
 #if defined(OS_CHROMEOS)
   // There's no need to show the sync promo on cros since cros users are logged
   // into sync already.
   return false;
-#endif
+#else
 
   // Don't bother if we don't have any kind of network connection.
   if (net::NetworkChangeNotifier::IsOffline())
     return false;
 
-  // Honor the sync policies.
-  if (!profile->GetOriginalProfile()->IsSyncAccessible())
-    return false;
-
-  // If the user is already signed into sync then don't show the promo.
-  ProfileSyncService* service =
-      ProfileSyncServiceFactory::GetInstance()->GetForProfile(
-          profile->GetOriginalProfile());
-  if (!service || service->HasSyncSetupCompleted())
-    return false;
-
-  // Default to allow the promo.
-  return true;
+  // Display the signin promo if the user is not signed in.
+  SigninManager* signin = SigninManagerFactory::GetForProfile(
+      profile->GetOriginalProfile());
+  return signin->GetAuthenticatedUsername().empty();
+#endif
 }
 
 // static
 void SyncPromoUI::RegisterUserPrefs(PrefServiceSyncable* prefs) {
   prefs->RegisterIntegerPref(prefs::kSyncPromoStartupCount, 0,
                              PrefServiceSyncable::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kSyncPromoUserSkipped, false,
                              PrefServiceSyncable::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kSyncPromoShowOnFirstRunAllowed, true,
                              PrefServiceSyncable::UNSYNCABLE_PREF);
@@ skipping 154 matching lines @@
       g_force_web_based_signin_flow;
 #else
   return false;
 #endif
 }
 
 // static
 void SyncPromoUI::ForceWebBasedSigninFlowForTesting(bool force) {
   g_force_web_based_signin_flow = force;
 }