| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/webui/ntp/ntp_login_handler.h" | 5 #include "chrome/browser/ui/webui/ntp/ntp_login_handler.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 if (header.empty()) { | 220 if (header.empty()) { |
| 221 header = CreateSpanWithClass(base::UTF8ToUTF16(username), | 221 header = CreateSpanWithClass(base::UTF8ToUTF16(username), |
| 222 "profile-name"); | 222 "profile-name"); |
| 223 } | 223 } |
| 224 } | 224 } |
| 225 } else { | 225 } else { |
| 226 #if !defined(OS_CHROMEOS) | 226 #if !defined(OS_CHROMEOS) |
| 227 // Chromeos does not show this status header. | 227 // Chromeos does not show this status header. |
| 228 SigninManager* signin = SigninManagerFactory::GetForProfile( | 228 SigninManager* signin = SigninManagerFactory::GetForProfile( |
| 229 profile->GetOriginalProfile()); | 229 profile->GetOriginalProfile()); |
| 230 if (!profile->IsManaged() && signin->IsSigninAllowed()) { | 230 if (!profile->IsSupervised() && signin->IsSigninAllowed()) { |
| 231 base::string16 signed_in_link = l10n_util::GetStringUTF16( | 231 base::string16 signed_in_link = l10n_util::GetStringUTF16( |
| 232 IDS_SYNC_PROMO_NOT_SIGNED_IN_STATUS_LINK); | 232 IDS_SYNC_PROMO_NOT_SIGNED_IN_STATUS_LINK); |
| 233 signed_in_link = CreateSpanWithClass(signed_in_link, "link-span"); | 233 signed_in_link = CreateSpanWithClass(signed_in_link, "link-span"); |
| 234 header = l10n_util::GetStringFUTF16( | 234 header = l10n_util::GetStringFUTF16( |
| 235 IDS_SYNC_PROMO_NOT_SIGNED_IN_STATUS_HEADER, | 235 IDS_SYNC_PROMO_NOT_SIGNED_IN_STATUS_HEADER, |
| 236 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)); | 236 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)); |
| 237 sub_header = l10n_util::GetStringFUTF16( | 237 sub_header = l10n_util::GetStringFUTF16( |
| 238 IDS_SYNC_PROMO_NOT_SIGNED_IN_STATUS_SUB_HEADER, signed_in_link); | 238 IDS_SYNC_PROMO_NOT_SIGNED_IN_STATUS_SUB_HEADER, signed_in_link); |
| 239 // Record that the user was shown the promo. | 239 // Record that the user was shown the promo. |
| 240 RecordInHistogram(NTP_SIGN_IN_PROMO_VIEWED); | 240 RecordInHistogram(NTP_SIGN_IN_PROMO_VIEWED); |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 values->SetString("login_status_message", message); | 275 values->SetString("login_status_message", message); |
| 276 values->SetString("login_status_url", | 276 values->SetString("login_status_url", |
| 277 hide_sync ? std::string() : chrome::kSyncLearnMoreURL); | 277 hide_sync ? std::string() : chrome::kSyncLearnMoreURL); |
| 278 values->SetString("login_status_advanced", | 278 values->SetString("login_status_advanced", |
| 279 hide_sync ? base::string16() : | 279 hide_sync ? base::string16() : |
| 280 l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_ADVANCED)); | 280 l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_ADVANCED)); |
| 281 values->SetString("login_status_dismiss", | 281 values->SetString("login_status_dismiss", |
| 282 hide_sync ? base::string16() : | 282 hide_sync ? base::string16() : |
| 283 l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_OK)); | 283 l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_OK)); |
| 284 } | 284 } |
| OLD | NEW |