ntp string cleanse

remove unused strings, and in one case start using an unused string (most visited delete tooltip)

a couple of the strings may still used by touch ntp and in the bookmarks pane, but both of these are getting removed quite soon

BUG=none
TEST=compile and visual inspection


Review URL: http://codereview.chromium.org/8746007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112366 0039d316-1c4b-4281-b951-d872f2087c98

chrome/app/generated_resources.grd

@@ -8891,22 +8891,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
                desc="The 'Most Visited' heading on the new tab page">
         Most visited
       </message>
-      <message name="IDS_NEW_TAB_BOOKMARKS_PAGE_TITLE" desc="The 'Bookmarks' title on the new tab page">
-        Bookmarks
-      </message>
-      <message name="IDS_NEW_TAB_BOOKMARKS_MANAGER_LINK_TITLE" desc="The title of the Bookmarks Manager link on the New Tab Page.">
-        Manage bookmarks
-      </message>
-      <message name="IDS_NEW_TAB_BOOKMARKS_SHOW_ALL_LINK_TITLE" desc="The title of the show all bookmarks link on the New Tab Page.">
-        Show all
-      </message>
-      <message name="IDS_NEW_TAB_BOOKMARKS_IMPORT_LINK_TITLE" desc="The title of the Import bookmarks link on the New Tab Page.">
-        Import bookmarks from another browser
-      </message>
-      <message name="IDS_NEW_TAB_RESTORE_THUMBNAILS_LINK"
-         desc="The link that restores previously removed thumbnails">
-        Restore all removed thumbnails
-      </message>
       <message name="IDS_NEW_TAB_RESTORE_THUMBNAILS_SHORT_LINK"
          desc="The link that restores previously removed thumbnails. Context is 'Thumbnail removed. Undo | Restore all'">
         Restore all
@@ -8964,50 +8948,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
          desc="Tooltip text for the button that removes/blacklists the thumbnail. Once removed the thumbnail will not show up on the new tab page again.">
         Don't show on this page
       </message>
-      <message name="IDS_NEW_TAB_PIN_THUMBNAIL_TOOLTIP"
-         desc="Tooltip text for the button that pins the thumbnail. Once pinned the thumbnail will always be shown on the new tab page and it will alwyas be shown in the same position.">
-        Keep on this page
-      </message>
-      <message name="IDS_NEW_TAB_UNPIN_THUMBNAIL_TOOLTIP"
-         desc="Tooltip text for the button that unpins the thumbnail. Once unpinned the thumbnail might not be displayed on the new tab page any more.">
-        Don't keep on this page
-      </message>
-      <message name="IDS_NEW_TAB_SHOW_HIDE_THUMBNAIL_TOOLTIP"
-         desc="Tooltip text for the button that shows and hides the thumbnail.">
-        Thumbnail view
-      </message>
-      <message name="IDS_NEW_TAB_SHOW_HIDE_LIST_TOOLTIP"
-         desc="Tooltip text for the button that shows and hides the list view.">
-        List view
-      </message>
-      <message name="IDS_NEW_TAB_PAGE_DISPLAY_TOOLTIP"
-         desc="Tooltip text for the button that shows the menu that hides and shows different sections on the new tab page.">
-        Change page layout
-      </message>
-      <message name="IDS_NEW_TAB_HOME_PAGE_SET_NOTIFICATION"
-         desc="Notification text to show after the user has made the NTP his/her home page.">
-        Welcome to your home page!
-      </message>
-      <message name="IDS_NEW_TAB_HOME_PAGE_HIDE_NOTIFICATION"
-         desc="The action text to show as the close link for the notification shown after the user has set his/her home page.">
-        Close
-      </message>
-      <message name="IDS_NEW_TAB_MAKE_THIS_HOMEPAGE"
-               desc="Text for link that sets new tab page as home page">
-        Make this my home page
-      </message>
-      <message name="IDS_NEW_TAB_HISTORY"
-               desc="The text of the link that takes the user to the history page. This is shown in the footer.">
-        History
-      </message>
-      <message name="IDS_NEW_TAB_DOWNLOADS"
-               desc="The text of the link that takes the user to the downloads page. This is shown in the footer.">
-        Downloads
-      </message>
-      <message name="IDS_NEW_TAB_HELP"
-               desc="The text of the link that takes the user to the help page. This is shown in the footer.">
-        Help
-      </message>
       <message name="IDS_NEW_TAB_APP_SETTINGS"
                desc="Text for the tooltip that is used for the button that shows the settings for an app icon.">
         Settings
@@ -9024,10 +8964,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
                desc="Text for the button that creates an app shortcut.">
         Create shortcut
       </message>
-      <message name="IDS_NEW_TAB_WEBSTORE_PAGE_TITLE"
-         desc="Title for the hard coded thumbnail that represents the webstore page. This is used on the NTP when there aren't enough thumbnails to show.">
-        Apps, Extensions and Themes
-      </message>
       <message name="IDS_APP_DEFAULT_PAGE_NAME"
                desc="Default name for the first 'Apps' page on the New Tab Page.">
         Apps

chrome/browser/resources/ntp4/most_visited_page.js

@@ -8,6 +8,7 @@ cr.define('ntp4', function() {
   var TilePage = ntp4.TilePage;
 
   /**
+   * A counter for generating unique tile IDs.
    */
   var tileID = 0;
 
@@ -61,6 +62,9 @@ cr.define('ntp4', function() {
           '<div class="color-stripe"></div>' +
           '<span class="title"></span>';
 
+      this.querySelector('.close-button').title =
+          templateData.removethumbnailtooltip;
+
       this.tabIndex = -1;
       this.data_ = null;
       this.removeAttribute('id');

chrome/browser/ui/webui/ntp/ntp_resource_cache.cc

@@ -282,7 +282,6 @@ void NTPResourceCache::CreateNewTabHTML() {
   // profile is not the default.
   string16 apps = l10n_util::GetStringUTF16(IDS_NEW_TAB_APPS);
   string16 title = l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE);
-  string16 most_visited = l10n_util::GetStringUTF16(IDS_NEW_TAB_MOST_VISITED);
   DictionaryValue localized_strings;
   localized_strings.SetString("bookmarkbarattached",
       profile_->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar) ?
@@ -293,19 +292,14 @@ void NTPResourceCache::CreateNewTabHTML() {
       "true" : "false");
   localized_strings.SetString("apps", apps);
   localized_strings.SetString("title", title);
-  localized_strings.SetString("mostvisited", most_visited);
-  localized_strings.SetString("bookmarksPage",
-      l10n_util::GetStringUTF16(IDS_NEW_TAB_BOOKMARKS_PAGE_TITLE));
-  localized_strings.SetString("restorethumbnails",
-      l10n_util::GetStringUTF16(IDS_NEW_TAB_RESTORE_THUMBNAILS_LINK));
+  localized_strings.SetString("mostvisited",
+      l10n_util::GetStringUTF16(IDS_NEW_TAB_MOST_VISITED));
   localized_strings.SetString("restoreThumbnailsShort",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_RESTORE_THUMBNAILS_SHORT_LINK));
   localized_strings.SetString("recentlyclosed",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_RECENTLY_CLOSED));
   localized_strings.SetString("closedwindowsingle",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_SINGLE));
-  localized_strings.SetString("foreignsessions",
-      l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_TABS));
   localized_strings.SetString("closedwindowmultiple",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_MULTIPLE));
   localized_strings.SetString("attributionintro",
@@ -316,27 +310,6 @@ void NTPResourceCache::CreateNewTabHTML() {
       l10n_util::GetStringUTF16(IDS_NEW_TAB_UNDO_THUMBNAIL_REMOVE));
   localized_strings.SetString("removethumbnailtooltip",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_REMOVE_THUMBNAIL_TOOLTIP));
-  localized_strings.SetString("pinthumbnailtooltip",
-      l10n_util::GetStringUTF16(IDS_NEW_TAB_PIN_THUMBNAIL_TOOLTIP));
-  localized_strings.SetString("unpinthumbnailtooltip",
-      l10n_util::GetStringUTF16(IDS_NEW_TAB_UNPIN_THUMBNAIL_TOOLTIP));
-  localized_strings.SetString("showhidethumbnailtooltip",
-      l10n_util::GetStringUTF16(IDS_NEW_TAB_SHOW_HIDE_THUMBNAIL_TOOLTIP));
-  localized_strings.SetString("showhidelisttooltip",
-      l10n_util::GetStringUTF16(IDS_NEW_TAB_SHOW_HIDE_LIST_TOOLTIP));
-  localized_strings.SetString("pagedisplaytooltip",
-      l10n_util::GetStringUTF16(IDS_NEW_TAB_PAGE_DISPLAY_TOOLTIP));
-  localized_strings.SetString("close", l10n_util::GetStringUTF16(IDS_CLOSE));
-  localized_strings.SetString("history",
-      l10n_util::GetStringUTF16(IDS_NEW_TAB_HISTORY));
-  localized_strings.SetString("downloads",
-      l10n_util::GetStringUTF16(IDS_NEW_TAB_DOWNLOADS));
-  localized_strings.SetString("help",
-      l10n_util::GetStringUTF16(IDS_NEW_TAB_HELP));
-  localized_strings.SetString("helpurl",
-      GetUrlWithLang(GURL(kHelpContentUrl)));
-  localized_strings.SetString("appsettings",
-      l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_SETTINGS));
   localized_strings.SetString("appuninstall",
       l10n_util::GetStringFUTF16(
           IDS_NEW_TAB_APP_UNINSTALL,
@@ -355,20 +328,10 @@ void NTPResourceCache::CreateNewTabHTML() {
       l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_WINDOW));
   localized_strings.SetString("applaunchtypefullscreen",
       l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_FULLSCREEN));
-  localized_strings.SetString("web_store_title",
-      l10n_util::GetStringUTF16(IDS_EXTENSION_WEB_STORE_TITLE));
-  localized_strings.SetString("web_store_url",
-      GetUrlWithLang(GURL(extension_urls::GetWebstoreLaunchURL())));
   localized_strings.SetString("syncpromotext",
       l10n_util::GetStringUTF16(IDS_SYNC_START_SYNC_BUTTON_LABEL));
   localized_strings.SetString("syncLinkText",
       l10n_util::GetStringUTF16(IDS_SYNC_ADVANCED_OPTIONS));
-  localized_strings.SetString("bookmarksManagerLinkTitle",
-      l10n_util::GetStringUTF16(IDS_NEW_TAB_BOOKMARKS_MANAGER_LINK_TITLE));
-  localized_strings.SetString("bookmarksShowAllLinkTitle",
-      l10n_util::GetStringUTF16(IDS_NEW_TAB_BOOKMARKS_SHOW_ALL_LINK_TITLE));
-  localized_strings.SetString("importDataLinkTitle",
-      l10n_util::GetStringUTF16(IDS_NEW_TAB_BOOKMARKS_IMPORT_LINK_TITLE));
 #if defined(OS_CHROMEOS)
   localized_strings.SetString("expandMenu",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_CLOSE_MENU_EXPAND));