diff options
| author | dubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 10:56:51 +0000 |
|---|---|---|
| committer | dubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 10:56:51 +0000 |
| commit | 396e0475c97f12317f2073a39be1955286faf3b8 (patch) | |
| tree | ea58795ee4d86c3f2a3685a721b078454cc2cccb /chrome | |
| parent | 555db3ff5728ca5f20aa12434d619a9d0c067bdf (diff) | |
| download | chromium_src-396e0475c97f12317f2073a39be1955286faf3b8.zip chromium_src-396e0475c97f12317f2073a39be1955286faf3b8.tar.gz chromium_src-396e0475c97f12317f2073a39be1955286faf3b8.tar.bz2 | |
Add message about incognito mode to chrome://history confirmation dialog
BUG=114675
TEST=Manual
Review URL: https://chromiumcodereview.appspot.com/9837111
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130889 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/generated_resources.grd | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/history_ui.cc | 18 |
2 files changed, 18 insertions, 2 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 008bb2b..747355f 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -279,6 +279,8 @@ are declared in build/common.gypi. </message> <message name="IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING" desc="Warning shown before deleting"> Are you sure you want to delete these pages from your history? + +Psst! Incognito mode <ph name="SHORTCUT_KEY">$1<ex>(Ctrl+Shift+N)</ex></ph> may come in useful next time. </message> <!-- History HTML UI --> diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc index ed19d5d..8b8e872 100644 --- a/chrome/browser/ui/webui/history_ui.cc +++ b/chrome/browser/ui/webui/history_ui.cc @@ -54,6 +54,19 @@ static const int kMaxSearchResults = 100; static const char kStringsJsFile[] = "strings.js"; static const char kHistoryJsFile[] = "history.js"; +namespace { + +#if defined(OS_MACOSX) +// U+0028 U+21E7 U+2318 U+004E U+0029 in UTF8 +const char kIncognitoModeShortcut[] = "\x28\xE2\x8c\xA5\xE2\x8C\x98\x4E\x29"; +#elif defined(OS_WIN) +const char kIncognitoModeShortcut[] = "(Ctrl+Shift+N)"; +#else +const char kIncognitoModeShortcut[] = "(Shift+Ctrl+N)"; +#endif + +}; // namespace + //////////////////////////////////////////////////////////////////////////////// // // HistoryUIHTMLSource @@ -95,8 +108,9 @@ HistoryUIHTMLSource::HistoryUIHTMLSource() AddLocalizedString("removeselected", IDS_HISTORY_REMOVE_SELECTED_ITEMS); AddLocalizedString("clearallhistory", IDS_HISTORY_OPEN_CLEAR_BROWSING_DATA_DIALOG); - AddLocalizedString("deletewarning", - IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING); + AddString("deletewarning", + l10n_util::GetStringFUTF16(IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING, + UTF8ToUTF16(kIncognitoModeShortcut))); AddLocalizedString("actionMenuDescription", IDS_HISTORY_ACTION_MENU_DESCRIPTION); AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE); |