Revert 267095 "Remove WebUI NTP on Android."

trunk/src/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 114 matching lines @@
 void NTPLoginHandler::HandleShowSyncLoginUI(const base::ListValue* args) {
   Profile* profile = Profile::FromWebUI(web_ui());
   std::string username = profile->GetPrefs()->GetString(
       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 sign in promo.
     if (signin::ShouldShowPromo(profile)) {
       signin::Source source =
           (web_contents->GetURL().spec() == chrome::kChromeUIAppsURL) ?
               signin::SOURCE_APPS_PAGE_LINK :
               signin::SOURCE_NTP_LINK;
       chrome::ShowBrowserSignin(browser, source);
       RecordInHistogram(NTP_SIGN_IN_PROMO_CLICKED);
     }
+#endif
   } else if (args->GetSize() == 4) {
     // The user is signed in, show the profiles menu.
     double x = 0;
     double y = 0;
     double width = 0;
     double height = 0;
     bool success = args->GetDouble(0, &x);
     DCHECK(success);
     success = args->GetDouble(1, &y);
     DCHECK(success);
@@ skipping 60 matching lines @@
             cache.GetGAIAPictureOfProfileAtIndex(profile_index);
         if (image)
           icon_url = webui::GetBitmapDataUrl(GetGAIAPictureForNTP(*image));
       }
       if (header.empty()) {
         header = CreateSpanWithClass(base::UTF8ToUTF16(username),
                                      "profile-name");
       }
     }
   } else {
-#if !defined(OS_CHROMEOS)
-    // Chromeos does not show this status header.
+#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+    // Android uses a custom sign in promo. Don't call the function
+    // signin::ShouldShowPromo() since it does a bunch of checks that are not
+    // required here.  We only want to suppress this login status for users that
+    // are not allowed to sign in.  Chromeos does not show this status header
+    // at all.
     SigninManager* signin = SigninManagerFactory::GetForProfile(
         profile->GetOriginalProfile());
     if (!profile->IsManaged() && signin->IsSigninAllowed()) {
       base::string16 signed_in_link = l10n_util::GetStringUTF16(
           IDS_SYNC_PROMO_NOT_SIGNED_IN_STATUS_LINK);
       signed_in_link = CreateSpanWithClass(signed_in_link, "link-span");
       header = l10n_util::GetStringFUTF16(
           IDS_SYNC_PROMO_NOT_SIGNED_IN_STATUS_HEADER,
           l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
       sub_header = l10n_util::GetStringFUTF16(
@@ skipping 37 matching lines @@
   values->SetString("login_status_message", message);
   values->SetString("login_status_url",
       hide_sync ? std::string() : chrome::kSyncLearnMoreURL);
   values->SetString("login_status_advanced",
       hide_sync ? base::string16() :
       l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_ADVANCED));
   values->SetString("login_status_dismiss",
       hide_sync ? base::string16() :
       l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_OK));
 }