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

chrome/browser/ui/chrome_pages.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/chrome_pages.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/options/content_settings_handler.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
@@ skipping 152 matching lines @@
       GetSingletonTabNavigateParams(browser, GURL(kChromeUIUberURL)));
   params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE;
   ShowSingletonTabOverwritingNTP(browser, params);
 }
 
 void ShowSearchEngineSettings(Browser* browser) {
   content::RecordAction(UserMetricsAction("EditSearchEngines"));
   ShowSettingsSubPage(browser, kSearchEnginesSubPage);
 }
 
-void ShowSyncSetup(Browser* browser, SyncPromoUI::Source source) {
+void ShowBrowserSignin(Browser* browser, SyncPromoUI::Source source) {
   Profile* original_profile = browser->profile()->GetOriginalProfile();
   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(
           original_profile);
-  if (service->HasSyncSetupCompleted()) {
+  // If we're signed in, just show settings.
+  if (!service->signin()->GetAuthenticatedUsername().empty()) {
     ShowSettings(browser);
   } else {
     // If the browser's profile is an incognito profile, make sure to use
     // a browser window from the original profile.  The user cannot sign in
     // from an incognito window.
     if (browser->profile()->IsOffTheRecord()) {
       browser =
           chrome::FindOrCreateTabbedBrowser(original_profile,
                                             chrome::HOST_DESKTOP_TYPE_NATIVE);
     }
@@ skipping 28 matching lines @@
   GURL url(GaiaUrls::GetInstance()->service_login_url());
   url = chrome_common_net::AppendQueryParameter(url, "service", service);
   if (continue_url.is_valid())
     url = chrome_common_net::AppendQueryParameter(url,
                                                   "continue",
                                                   continue_url.spec());
   NavigateToSingletonTab(browser, url);
 }
 
 }  // namespace chrome