summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarv@google.com <arv@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-27 17:48:01 +0000
committerarv@google.com <arv@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-27 17:48:01 +0000
commitb77656d8e282ad9b2055c912c4631a84c542497b (patch)
tree4aa4c5b1c0034f8b1d167193ade3423a87c52038
parentf54c0e28afa284407d9b4066a1f1a8a98da8c409 (diff)
downloadchromium_src-b77656d8e282ad9b2055c912c4631a84c542497b.zip
chromium_src-b77656d8e282ad9b2055c912c4631a84c542497b.tar.gz
chromium_src-b77656d8e282ad9b2055c912c4631a84c542497b.tar.bz2
Fix the forgotten renames of recommendations to tips.
BUG=15491 TEST=Open the options menu and there should be no "null" in the UI Review URL: http://codereview.chromium.org/147249 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19467 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/generated_resources.grd8
-rw-r--r--chrome/browser/dom_ui/new_tab_ui.cc8
2 files changed, 8 insertions, 8 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 9f00cec..04cd054 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3476,12 +3476,12 @@ each locale. -->
desc="Menu item text used to hide recent activities.">
Hide recent activities
</message>
- <message name="IDS_NEW_TAB_SHOW_RECOMMENDATIONS"
- desc="Menu item text used to show recommendations.">
+ <message name="IDS_NEW_TAB_SHOW_TIPS"
+ desc="Menu item text used to show tips.">
Show recommendations
</message>
- <message name="IDS_NEW_TAB_HIDE_RECOMMENDATIONS"
- desc="Menu item text used to hide recommendations.">
+ <message name="IDS_NEW_TAB_HIDE_TIPS"
+ desc="Menu item text used to hide tips.">
Hide recommendations
</message>
<message name="IDS_NEW_TAB_THUMBNAIL_REMOVED_NOTIFICATION"
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc
index 9be3e72..f6af1ad 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -315,10 +315,10 @@ void NewTabHTMLSource::StartDataRequest(const std::string& path,
l10n_util::GetString(IDS_NEW_TAB_SHOW_RECENT));
localized_strings.SetString(L"hiderecent",
l10n_util::GetString(IDS_NEW_TAB_HIDE_RECENT));
- localized_strings.SetString(L"showrecommendations",
- l10n_util::GetString(IDS_NEW_TAB_SHOW_RECOMMENDATIONS));
- localized_strings.SetString(L"hiderecommendations",
- l10n_util::GetString(IDS_NEW_TAB_HIDE_RECOMMENDATIONS));
+ localized_strings.SetString(L"showtips",
+ l10n_util::GetString(IDS_NEW_TAB_SHOW_TIPS));
+ localized_strings.SetString(L"hidetips",
+ l10n_util::GetString(IDS_NEW_TAB_HIDE_TIPS));
localized_strings.SetString(L"thumbnailremovednotification",
l10n_util::GetString(IDS_NEW_TAB_THUMBNAIL_REMOVED_NOTIFICATION));
localized_strings.SetString(L"undothumbnailremove",