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 "chrome/common/net/url_util.h"
@@ skipping 90 matching lines @@
   // There's no need to show the sync promo on cros since cros users are logged
   // into sync already.
   return false;
 #endif
 
   // 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;
+  profile = profile->GetOriginalProfile();

[sail, 2013/01/29 19:17:16]

Changing passed in parameters is really confusing. Use a new variable instead.
Also, update the code below that calls GetOriginalProfile() to use the new temp
variable.

[Andrew T Wilson (Slow), 2013/01/30 13:55:50]

Done.

+  if (!profile->IsSyncAccessible()) {
+    // Sync is disabled by policy - display the promo if the user is not signed

[sail, 2013/01/29 19:17:16]

I don't understand this. This implies that if sync is accessible we may show the
promo if the user is signed in. Why would we do that?

I guess what I'm trying to say is, how is this different from the
HasSyncSetupCompleted() check below?

[Andrew T Wilson (Slow), 2013/01/30 07:43:41]

If sync is accessible (meaning not disabled by policy/command line flags) we
just fall through to the old logic below (no logic change).

If sync is not accessible, then we return true if the user is not yet signed in.

So previously, we would not show the promo if sync was disabled by policy. But
now, in that case, we still show the promo if the user isn't signed in yet
because we want to prompt the user to signin (the promo becomes more of a
"signin promo" and not a "sync promo").

Let me know if you think this is inappropriate somehow.

[Andrew T Wilson (Slow), 2013/01/30 13:55:50]

Actually, after re-reading your comment, I've changed this to show the promo if
the user is not logged in, regardless of whether sync is enabled or disabled by
policy. The logic is much simpler.

As before, let me know if you think this is inappropriate.

[sail, 2013/01/30 17:51:01]

Awesome!

+    // in.
+    SigninManager* signin = SigninManagerFactory::GetForProfile(profile);
+    return signin->GetAuthenticatedUsername().empty();
+  }
 
   // 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;
@@ skipping 166 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;
 }