| Index: chrome/browser/ui/webui/ntp/ntp_login_handler.cc
|
| diff --git a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
|
| index 65459a3e34066d42276ffc3f33c1a366ee5ab85f..84f8290e67655f88329a4d43da213b1e04113cff 100644
|
| --- a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
|
| +++ b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
|
| @@ -132,7 +132,6 @@ void NTPLoginHandler::HandleShowSyncLoginUI(const base::ListValue* args) {
|
| 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 =
|
| @@ -142,7 +141,6 @@ void NTPLoginHandler::HandleShowSyncLoginUI(const base::ListValue* args) {
|
| 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;
|
| @@ -223,12 +221,8 @@ void NTPLoginHandler::UpdateLogin() {
|
| }
|
| }
|
| } else {
|
| -#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.
|
| +#if !defined(OS_CHROMEOS)
|
| + // Chromeos does not show this status header.
|
| SigninManager* signin = SigninManagerFactory::GetForProfile(
|
| profile->GetOriginalProfile());
|
| if (!profile->IsManaged() && signin->IsSigninAllowed()) {
|
|
|