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

chrome/browser/ui/webui/ntp/ntp_login_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/ntp/ntp_login_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 118 matching lines @@
       prefs::kGoogleServicesUsername);
   content::WebContents* web_contents = web_ui()->GetWebContents();
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
   if (!browser)
     return;
 
   if (username.empty()) {
 #if !defined(OS_ANDROID)
     // The user isn't signed in, show the sync promo.
     if (SyncPromoUI::ShouldShowSyncPromo(profile)) {
-      chrome::ShowSyncSetup(browser, SyncPromoUI::SOURCE_NTP_LINK);
+      chrome::ShowBrowserSignin(browser, SyncPromoUI::SOURCE_NTP_LINK);
       RecordInHistogram(NTP_SIGN_IN_PROMO_CLICKED);
     }
 #endif
   } else if (args->GetSize() == 4 &&
              chrome::IsCommandEnabled(browser, IDC_SHOW_AVATAR_MENU)) {
     // The user is signed in, show the profiles menu.
     double x = 0;
     double y = 0;
     double width = 0;
     double height = 0;
@@ skipping 30 matching lines @@
   Profile::FromWebUI(web_ui())->GetPrefs()->SetBoolean(
       prefs::kSyncPromoShowNTPBubble, false);
   NewTabUI* ntp_ui = NewTabUI::FromWebUIController(web_ui()->GetController());
   ntp_ui->set_showing_sync_bubble(true);
 }
 
 void NTPLoginHandler::HandleShowAdvancedLoginUI(const ListValue* args) {
   Browser* browser =
       chrome::FindBrowserWithWebContents(web_ui()->GetWebContents());
   if (browser)
-    chrome::ShowSyncSetup(browser, SyncPromoUI::SOURCE_NTP_LINK);
+    chrome::ShowBrowserSignin(browser, SyncPromoUI::SOURCE_NTP_LINK);
 }
 
 void NTPLoginHandler::UpdateLogin() {
   Profile* profile = Profile::FromWebUI(web_ui());
   std::string username = profile->GetPrefs()->GetString(
       prefs::kGoogleServicesUsername);
 
   string16 header, sub_header;
   std::string icon_url;
   if (!username.empty()) {
@@ skipping 42 matching lines @@
       header_value, sub_header_value, icon_url_value, is_user_signed_in);
 }
 
 // static
 bool NTPLoginHandler::ShouldShow(Profile* profile) {
 #if defined(OS_CHROMEOS)
   // For now we don't care about showing sync status on Chrome OS. The promo
   // UI and the avatar menu don't exist on that platform.
   return false;
 #else
-  if (profile->IsOffTheRecord())
-    return false;
-
-  return profile->GetOriginalProfile()->IsSyncAccessible();
+  return !profile->IsOffTheRecord();
 #endif
 }
 
 // static
 void NTPLoginHandler::GetLocalizedValues(Profile* profile,
                                          DictionaryValue* values) {
   PrefService* prefs = profile->GetPrefs();
   std::string error_message = prefs->GetString(prefs::kSyncPromoErrorMessage);
   bool hide_sync = !prefs->GetBoolean(prefs::kSyncPromoShowNTPBubble);
 
   string16 message =
       hide_sync ? string16() :
           !error_message.empty() ? UTF8ToUTF16(error_message) :
               l10n_util::GetStringFUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_MESSAGE,
                   l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
 
   values->SetString("login_status_message", message);
   values->SetString("login_status_url",
       hide_sync ? std::string() : chrome::kSyncLearnMoreURL);
   values->SetString("login_status_advanced",
       hide_sync || !error_message.empty() ? string16() :
       l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_ADVANCED));
   values->SetString("login_status_dismiss",
       hide_sync ? string16() :
       l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_OK));
 }