From bb33d0fde9e12edb98e5b9f4dd9b46076dfae1d1 Mon Sep 17 00:00:00 2001
From: michaelpg <michaelpg@chromium.org>
Date: Sun, 20 Sep 2015 04:35:55 -0700
Subject: [PATCH] eraser: Remove redundant app launcher strings

Review URL: https://codereview.chromium.org/1314093003

Cr-Commit-Position: refs/heads/master@{#349879}
---
 chrome/app/generated_resources.grd                      | 12 ------------
 chrome/browser/ui/ash/launcher/launcher_context_menu.cc | 10 +++++-----
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 6f21ca5509e3..e41f01e4dcfd 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -13863,12 +13863,6 @@ After you create a new supervised user, you can manage their settings at any tim
 
       <!-- Aura strings -->
       <if expr="use_ash">
-        <message name="IDS_LAUNCHER_CONTEXT_MENU_NEW_TAB" desc="Title text for the 'open new' context menu item of the launcher for apps configured to open in a tab">
-          New tab
-        </message>
-        <message name="IDS_LAUNCHER_CONTEXT_MENU_NEW_WINDOW" desc="Title text for the 'open new' context menu item of the launcher for apps configured to open windowed">
-          New window
-        </message>
         <message name="IDS_LAUNCHER_CONTEXT_MENU_CLOSE" desc="Title text for the 'close' context menu item of the launcher">
           Close
         </message>
@@ -13878,12 +13872,6 @@ After you create a new supervised user, you can manage their settings at any tim
         <message name="IDS_LAUNCHER_CONTEXT_MENU_UNPIN" desc="Title text for the 'unpin' context menu item of the launcher">
           Unpin
         </message>
-        <message name="IDS_LAUNCHER_NEW_WINDOW" desc="The text label of the New Window menu item">
-          New window
-        </message>
-        <message name="IDS_LAUNCHER_NEW_INCOGNITO_WINDOW" desc="The text label of the New incognito window menu item">
-          New incognito window
-        </message>
       </if>
 
       <!-- Panel windows -->
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
index 25f3effb7851..9b6ac3daec60 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
@@ -131,10 +131,10 @@ void LauncherContextMenu::Init() {
       }
     } else if (item_.type == ash::TYPE_BROWSER_SHORTCUT) {
       AddItem(MENU_NEW_WINDOW,
-              l10n_util::GetStringUTF16(IDS_LAUNCHER_NEW_WINDOW));
+              l10n_util::GetStringUTF16(IDS_APP_LIST_NEW_WINDOW));
       if (!controller_->IsLoggedInAsGuest()) {
         AddItem(MENU_NEW_INCOGNITO_WINDOW,
-                l10n_util::GetStringUTF16(IDS_LAUNCHER_NEW_INCOGNITO_WINDOW));
+                l10n_util::GetStringUTF16(IDS_APP_LIST_NEW_INCOGNITO_WINDOW));
       }
     } else if (item_.type == ash::TYPE_DIALOG) {
       AddItem(MENU_CLOSE,
@@ -199,15 +199,15 @@ bool LauncherContextMenu::IsItemForCommandIdDynamic(int command_id) const {
 base::string16 LauncherContextMenu::GetLabelForCommandId(int command_id) const {
   if (command_id == MENU_OPEN_NEW) {
     if (item_.type == ash::TYPE_PLATFORM_APP) {
-      return l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_NEW_WINDOW);
+      return l10n_util::GetStringUTF16(IDS_APP_LIST_CONTEXT_MENU_NEW_WINDOW);
     }
     switch (controller_->GetLaunchType(item_.id)) {
       case extensions::LAUNCH_TYPE_PINNED:
       case extensions::LAUNCH_TYPE_REGULAR:
-        return l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_NEW_TAB);
+        return l10n_util::GetStringUTF16(IDS_APP_LIST_CONTEXT_MENU_NEW_TAB);
       case extensions::LAUNCH_TYPE_FULLSCREEN:
       case extensions::LAUNCH_TYPE_WINDOW:
-        return l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_NEW_WINDOW);
+        return l10n_util::GetStringUTF16(IDS_APP_LIST_CONTEXT_MENU_NEW_WINDOW);
       default:
         NOTREACHED();
         return base::string16();
-- 
2.11.4.GIT