Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2944)

Unified Diff: chrome/browser/ui/webui/ntp/ntp_resource_cache.cc

Issue 208683007: Update incognito and guest browsing new tab page: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix ChromeOS build error, remove surplus font attribute Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
index ba8d89e554d09a2c7005e3d3fe86cc80b7ab3183..57844cbc14c59dcf97bcc1edd30f7be6c19f8cb8 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -294,6 +294,9 @@ void NTPResourceCache::CreateNewTabIncognitoHTML() {
localized_strings.SetString("title",
l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE));
int new_tab_message_ids = IDS_NEW_TAB_OTR_MESSAGE;
+ int new_tab_heading_ids = IDS_NEW_TAB_OTR_HEADING;
+ int new_tab_link_ids = IDS_NEW_TAB_OTR_LEARN_MORE_LINK;
+ int new_tab_warning_ids = IDS_NEW_TAB_OTR_MESSAGE_WARNING;
int new_tab_html_idr = IDR_INCOGNITO_TAB_HTML;
const char* new_tab_link = kLearnMoreIncognitoUrl;
@@ -301,6 +304,8 @@ void NTPResourceCache::CreateNewTabIncognitoHTML() {
#if defined(OS_CHROMEOS)
if (profile_->IsGuestSession()) {
new_tab_message_ids = IDS_NEW_TAB_GUEST_SESSION_MESSAGE;
+ new_tab_heading_ids = IDS_NEW_TAB_GUEST_SESSION_HEADING;
+ new_tab_link_ids = IDS_NEW_TAB_GUEST_SESSION_LEARN_MORE_LINK;
edwardjung 2014/04/22 14:24:35 Made changes here so that it's in line with the ot
Evan Stade 2014/04/22 17:52:52 You should ping someone (altimofeev looks like a g
edwardjung 2014/04/23 10:42:10 Confirmed with the Moscow team that this is still
new_tab_html_idr = IDR_GUEST_SESSION_TAB_HTML;
new_tab_link = kLearnMoreGuestSessionUrl;
@@ -324,13 +329,17 @@ void NTPResourceCache::CreateNewTabIncognitoHTML() {
}
#endif
- localized_strings.SetString("content",
- l10n_util::GetStringFUTF16(new_tab_message_ids,
- GetUrlWithLang(GURL(new_tab_link))));
- localized_strings.SetString("extensionsmessage",
- l10n_util::GetStringFUTF16(
- IDS_NEW_TAB_OTR_EXTENSIONS_MESSAGE,
- base::ASCIIToUTF16(chrome::kChromeUIExtensionsURL)));
+ localized_strings.SetString("message",
+ l10n_util::GetStringUTF16(new_tab_message_ids));
+ localized_strings.SetString("heading",
+ l10n_util::GetStringUTF16(new_tab_heading_ids));
+ localized_strings.SetString("learnMore",
+ l10n_util::GetStringUTF16(new_tab_link_ids));
+ localized_strings.SetString("learnMoreLink",
+ GetUrlWithLang(GURL(new_tab_link)));
+ localized_strings.SetString("warning",
+ l10n_util::GetStringUTF16(new_tab_warning_ids));
+
bool bookmark_bar_attached = profile_->GetPrefs()->GetBoolean(
prefs::kShowBookmarkBar);
localized_strings.SetBoolean("bookmarkbarattached", bookmark_bar_attached);
@@ -352,9 +361,18 @@ void NTPResourceCache::CreateNewTabGuestHTML() {
localized_strings.SetString("title",
l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE));
const char* new_tab_link = kLearnMoreGuestSessionUrl;
- localized_strings.SetString("content",
- l10n_util::GetStringFUTF16(IDS_NEW_TAB_GUEST_SESSION_MESSAGE,
- GetUrlWithLang(GURL(new_tab_link))));
+ int guest_tab_message_ids = IDS_NEW_TAB_GUEST_SESSION_MESSAGE;
+ int guest_tab_heading_ids = IDS_NEW_TAB_GUEST_SESSION_HEADING;
+ int guest_tab_link_ids = IDS_NEW_TAB_GUEST_SESSION_LEARN_MORE_LINK;
+
+ localized_strings.SetString("message",
+ l10n_util::GetStringUTF16(guest_tab_message_ids));
+ localized_strings.SetString("heading",
+ l10n_util::GetStringUTF16(guest_tab_heading_ids));
+ localized_strings.SetString("learnMore",
+ l10n_util::GetStringUTF16(guest_tab_link_ids));
+ localized_strings.SetString("learnMoreLink",
+ GetUrlWithLang(GURL(new_tab_link)));
webui::SetFontAndTextDirection(&localized_strings);

Powered by Google App Engine
This is Rietveld 408576698