diff options
| -rw-r--r-- | chrome/app/generated_resources.grd | 24 | ||||
| -rw-r--r-- | chrome/browser/resources/incognito_tab.css | 31 | ||||
| -rw-r--r-- | chrome/browser/resources/incognito_tab.html | 5 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/ntp/ntp_resource_cache.cc | 5 |
4 files changed, 27 insertions, 38 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 5477642..d549e68 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -9510,25 +9510,15 @@ experiment id: "<ph name="EXPERIMENT_ID">$5<ex>ar1</ex></ph>" </message> </if> <if expr="not pp_ifdef('android')"> - <message name="IDS_NEW_TAB_OTR_MESSAGE" - desc="Used when a person opens an OTR window"> - <ph name="BEGIN_BOLD"><strong></ph>You've gone incognito<ph name="END_BOLD">"</strong></ph>. Pages you view in this window won't appear in your browser history or search history, and they won't leave other traces, like cookies, on your computer after you close <strong>all</strong> open incognito windows. Any files you download or bookmarks you create will be preserved, however. - <ph name="LINE_BREAK"><br /><br /></ph> - <ph name="BEGIN_BOLD"><strong></ph>Going incognito doesn't affect the behavior of other people, servers, or software. Be wary of:<ph name="END_BOLD"></strong></ph> - <ph name="BEGIN_LIST"><ul></ph> - <ph name="BEGIN_LIST_ITEM"><li></ph>Websites that collect or share information about you<ph name="END_LIST_ITEM"></li></ph> - <ph name="BEGIN_LIST_ITEM"><li></ph>Internet service providers or employers that track the pages you visit<ph name="END_LIST_ITEM"></li></ph> - <ph name="BEGIN_LIST_ITEM"><li></ph>Malicious software that tracks your keystrokes in exchange for free smileys<ph name="END_LIST_ITEM"></li></ph> - <ph name="BEGIN_LIST_ITEM"><li></ph>Surveillance by secret agents<ph name="END_LIST_ITEM"></li></ph> - <ph name="BEGIN_LIST_ITEM"><li></ph>People standing behind you<ph name="END_LIST_ITEM"></li></ph> - <ph name="END_LIST"></ul></ph> - <ph name="BEGIN_LINK"><a href="$1"></ph>Learn more<ph name="END_LINK"></a></ph> about incognito browsing. + <message name="IDS_NEW_TAB_INCOGNITO_MESSAGE" + desc="Used when a person opens an incognito window"> + <ph name="BEGIN_HEADING"><h1></ph>You've gone incognito<ph name="END_HEADING"></h1></ph> + <ph name="BEGIN_PARAGRAPH"><p></ph>Pages you view in this window won't appear in your browser history or search history, and they won't leave other traces, like cookies, on your computer after you close <strong>all</strong> open incognito windows. Any files you download or bookmarks you create will be preserved. Be aware that websites, your internet provider, and people standing behind you may still be able to see what you do. <ph name="BEGIN_LINK"><a href="$1"></ph>Learn more about incognito browsing.<ph name="END_LINK"></a></ph><ph name="END_PARAGRAPH"></p></ph> </message> </if> - <message name="IDS_NEW_TAB_OTR_EXTENSIONS_MESSAGE" - desc="Explanation in a new OTR window that extensions have been disabled while in OTR."> - Because <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> does not control how extensions handle your personal data, all extensions have been disabled for incognito windows. You can reenable them individually in the - <ph name="BEGIN_LINK"><a href="$2"></ph>extensions manager<ph name="END_LINK"></a></ph>. + <message name="IDS_NEW_TAB_INCOGNITO_EXTENSIONS_MESSAGE" + desc="Explanation in a new incognito window that extensions have been disabled while in incognito."> + Because extensions handle your personal data, all extensions are disabled in incognito windows; you can reenable them in the <ph name="BEGIN_LINK"><a href="$1"></ph>extensions manager<ph name="END_LINK"></a></ph>. </message> <if expr="pp_ifdef('android')"> <message name="IDS_NEW_TAB_GUEST_SESSION_MESSAGE" diff --git a/chrome/browser/resources/incognito_tab.css b/chrome/browser/resources/incognito_tab.css index 19f9515..9dcf20c 100644 --- a/chrome/browser/resources/incognito_tab.css +++ b/chrome/browser/resources/incognito_tab.css @@ -9,39 +9,40 @@ body { .icon { -webkit-margin-end: 3px; -webkit-margin-start: 6px; + position: absolute; + top: -7px; } html[dir='ltr'] .icon { -webkit-transform: scaleX(-1); - float: right; + left: auto; + right: 10px; } html[dir='rtl'] .icon { - float: left; + left: 10px; + right: auto; } .content { - background-color: #eee; + background-color: #eaeaea; + border: 1px solid #d9d9d9; border-radius: 5px; + box-shadow: 0 3px 5px rgba(0, 0, 0, 0.25); color: black; margin-left: auto; margin-right: auto; margin-top: 66px; max-width: 600px; - padding: 10px; + padding: 10px 10px 0; + position: relative; } -.extensions-message { - -webkit-padding-start: 39px; - margin-top: 15px; - position: relative; +h1 { + font-size: 1.25em; + margin: 0; } -.extension-icon { - left: 0; - margin-top: -15px; - position: absolute; - right: 0; - top: 50%; - width: 30px; +p { + margin: 1em 0; } diff --git a/chrome/browser/resources/incognito_tab.html b/chrome/browser/resources/incognito_tab.html index 6ef679d..e783f32 100644 --- a/chrome/browser/resources/incognito_tab.html +++ b/chrome/browser/resources/incognito_tab.html @@ -14,10 +14,9 @@ document.write('<link id="incognitothemecss" rel="stylesheet" ' + <div class="content" i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> <img src="shared/images/otr_icon_standalone.png" class="icon" /> - <span i18n-values=".innerHTML:content"></span> + <div i18n-values=".innerHTML:content"></div> <div class="extensions-message"> - <img src="../../app/theme/extensions_section.png" class="extension-icon" /> - <span i18n-values=".innerHTML:extensionsmessage"></span> + <p i18n-values=".innerHTML:extensionsmessage"></p> </div> </div> </body> diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index 11b3f92..773b1a1 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -266,7 +266,7 @@ void NTPResourceCache::CreateNewTabIncognitoHTML() { DictionaryValue localized_strings; localized_strings.SetString("title", l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE)); - int new_tab_message_ids = IDS_NEW_TAB_OTR_MESSAGE; + int new_tab_message_ids = IDS_NEW_TAB_INCOGNITO_MESSAGE; int new_tab_html_idr = IDR_INCOGNITO_TAB_HTML; const char* new_tab_link = kLearnMoreIncognitoUrl; // TODO(altimofeev): consider implementation without 'if def' usage. @@ -282,8 +282,7 @@ void NTPResourceCache::CreateNewTabIncognitoHTML() { GetUrlWithLang(GURL(new_tab_link)))); localized_strings.SetString("extensionsmessage", l10n_util::GetStringFUTF16( - IDS_NEW_TAB_OTR_EXTENSIONS_MESSAGE, - l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), + IDS_NEW_TAB_INCOGNITO_EXTENSIONS_MESSAGE, ASCIIToUTF16(chrome::kChromeUIExtensionsURL))); bool bookmark_bar_attached = profile_->GetPrefs()->GetBoolean( prefs::kShowBookmarkBar); |