Remove unused User/Users strings from the profiles UI

The strings stopped being used in https://codereview.chromium.org/611033002/

XIB changes: use a different string ID for the profiles menu in the menu bar.

BUG=405988

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

Cr-Commit-Position: refs/heads/master@{#297422}

chrome/app/generated_resources.grd

@@ -11380,10 +11380,7 @@ Chrome ran out of memory.
       </if>
 
       <!-- Multi-profile -->
-      <message name="IDS_PROFILES_OPTIONS_GROUP_NAME" desc="The name of the sync group in the options dialog.">
-        Users
-      </message>
-      <message name="IDS_NEW_PROFILES_OPTIONS_GROUP_NAME" desc="The name of the sync group in the options dialog when using the new Profiles UI.">
+      <message name="IDS_PROFILES_OPTIONS_GROUP_NAME" desc="The name of the sync group in the options dialog when using the new Profiles UI.">
         People
       </message>
       <if expr="is_macosx">
@@ -11400,9 +11397,6 @@ Chrome ran out of memory.
           Switch to a different person.
         </message>
         <message name="IDS_PROFILES_CREATE_NEW_PROFILE_OPTION" desc="In Title Case. Create new profile menu item and button title.">
-          Add New User
-        </message>
-        <message name="IDS_NEW_PROFILES_CREATE_NEW_PROFILE_OPTION" desc="In Title Case. Create new profile menu item and button title when using the new Profiles UI.">
           Add Person...
         </message>
         <message name="IDS_PROFILES_NEW_AVATAR_BUTTON_ACCESSIBLE_NAME" desc="Title of the avatar button for accessibility">
@@ -11625,36 +11619,22 @@ Chrome ran out of memory.
         Shadow
       </message>
 
-      <if expr="is_macosx">
-        <message name="IDS_PROFILES_CUSTOMIZE_PROFILE" desc="In Title Case. Customize profile menu item.">
-          Customize User...
-        </message>
-      </if>
       <message name="IDS_PROFILES_LOCAL_PROFILE_STATE" desc="This is displayed underneath the profile name for profiles that are not signed in to sync.">
         Not signed in
       </message>
       <message name="IDS_PROFILES_CREATE_BUTTON_LABEL" desc="The label that appears on the profile create button in the options dialog to allow a user to create a new profile.">
-        Add new user...
-      </message>
-      <message name="IDS_NEW_PROFILES_CREATE_BUTTON_LABEL" desc="The label that appears on the profile create button in the options dialog to allow a user to create a new profile when using the new Profiles UI.">
         Add person...
       </message>
       <message name="IDS_PROFILES_MANAGE_BUTTON_LABEL" desc="The label that appears on the profile manage button in the options dialog to allow a user to manage their profile.">
         Edit...
       </message>
       <message name="IDS_PROFILES_DELETE_BUTTON_LABEL" desc="The label that appears on the profile delete button in the options dialog to allow a user to delete their profile.">
-        Delete...
-      </message>
-      <message name="IDS_NEW_PROFILES_DELETE_BUTTON_LABEL" desc="The label that appears on the profile delete button in the options dialog to allow a user to delete their profile using the new Profiles UI.">
         Remove...
       </message>
       <message name="IDS_PROFILES_SUPERVISED_USER_DASHBOARD_TIP" desc="A message that appears below the Users section on the Settings page when the current user manages supervised users on the machine, providing a link to the external management dashboard page.">
         Manage your supervised users via the <ph name="BEGIN_LINK">&lt;a target="_blank" href="https://chrome.com/manage"&gt;</ph>Supervised Users Dashboard<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>.
       </message>
       <message name="IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL" desc="The label that appears on the profile delete button in the options dialog to allow a user with only one profile to delete it.">
-        Delete this user
-      </message>
-      <message name="IDS_NEW_PROFILES_DELETE_SINGLE_BUTTON_LABEL" desc="The label that appears on the profile delete button in the options dialog to allow a user with only one profile to delete it when using the new Profiles UI.">
         Delete this person
       </message>
       <message name="IDS_PROFILES_DEFAULT_NAME" desc="The name to display for a profile when the user is not signed in.">
@@ -13429,9 +13409,6 @@ Some features may be unavailable.  Please check that the profile exists and you
     <if expr="not is_android">
       <!-- Manage Profile Dialog -->
       <message name="IDS_PROFILES_MANAGE_TITLE" desc="Title of the manage profile dialog">
-        Edit user
-      </message>
-      <message name="IDS_NEW_PROFILES_MANAGE_TITLE" desc="Title of the manage profile dialog when using the new Profiles UI">
         Edit
       </message>
       <message name="IDS_PROFILES_MANAGE_NAME_LABEL" desc="Label next to the profile name text field.">
@@ -13446,21 +13423,12 @@ Some features may be unavailable.  Please check that the profile exists and you
 
       <!-- Delete Profile Dialog -->
       <message name="IDS_PROFILES_DELETE_TITLE" desc="Title of the delete profile dialog">
-        Delete user
-      </message>
-      <message name="IDS_NEW_PROFILES_DELETE_TITLE" desc="Title of the delete profile dialog when using the new Profiles UI">
         Remove person?
       </message>
       <message name="IDS_PROFILES_DELETE_OK_BUTTON_LABEL" desc="The text to display on the button to confirm deleting the profile.">
-        Delete
-      </message>
-      <message name="IDS_NEW_PROFILES_DELETE_OK_BUTTON_LABEL" desc="The text to display on the button to confirm deleting the profile using the new Profiles UI.">
         Remove
       </message>
       <message name="IDS_PROFILES_DELETE_MESSAGE" desc="Message explaining to the user what will happen if they delete this profile">
-        Are you sure you want to delete "<ph name="PROFILE_NAME">$1<ex>New User</ex></ph>" and all the data associated with it from this computer? This cannot be undone!
-      </message>
-      <message name="IDS_NEW_PROFILES_DELETE_MESSAGE" desc="Message explaining to the user what will happen if they delete this profile">
         Are you sure you want to remove "<ph name="PROFILE_NAME">$1<ex>New User</ex></ph>" and all associated Chrome data from this computer? This cannot be undone.
       </message>
       <message name="IDS_PROFILES_DELETE_SUPERVISED_ADDENDUM" desc="Additional message shown in the same dialog following the IDS_PROFILES_DELETE_MESSAGE, explaining to the user what will happen if they delete the profile of a supervised user.">
@@ -13487,9 +13455,6 @@ Some features may be unavailable.  Please check that the profile exists and you
 
       <!-- Create Profile Dialog -->
       <message name="IDS_PROFILES_CREATE_TITLE" desc="Title of the create profile dialog">
-        Create user
-      </message>
-      <message name="IDS_NEW_PROFILES_CREATE_TITLE" desc="Title of the create profile dialog when using the new Profiles UI">
         Add person
       </message>
       <message name="IDS_PROFILES_CREATE_INSTRUCTIONS" desc="Instructions for the create profile dialog">

chrome/app/nibs/MainMenu.xib

@@ -1190,7 +1190,7 @@
 					</object>
 					<object class="NSMenuItem" id="594819081">
 						<reference key="NSMenu" ref="6368794"/>
-						<string key="NSTitle">^IDS_NEW_PROFILES_OPTIONS_GROUP_NAME</string>
+						<string key="NSTitle">^IDS_PROFILES_OPTIONS_GROUP_NAME</string>
 						<string key="NSKeyEquiv"/>
 						<int key="NSMnemonicLoc">2147483647</int>
 						<reference key="NSOnImage" ref="657443692"/>

chrome/browser/ui/cocoa/profiles/profile_menu_controller.mm

@@ -70,7 +70,7 @@ class Observer : public chrome::BrowserListObserver,
     mainMenuItem_ = item;
 
     base::scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle:
-        l10n_util::GetNSStringWithFixup(IDS_NEW_PROFILES_OPTIONS_GROUP_NAME)]);
+        l10n_util::GetNSStringWithFixup(IDS_PROFILES_OPTIONS_GROUP_NAME)]);
     [mainMenuItem_ setSubmenu:menu];
 
     // This object will be constructed as part of nib loading, which happens
@@ -111,7 +111,7 @@ class Observer : public chrome::BrowserListObserver,
 
   if (dock) {
     NSString* headerName =
-        l10n_util::GetNSStringWithFixup(IDS_NEW_PROFILES_OPTIONS_GROUP_NAME);
+        l10n_util::GetNSStringWithFixup(IDS_PROFILES_OPTIONS_GROUP_NAME);
     base::scoped_nsobject<NSMenuItem> header(
         [[NSMenuItem alloc] initWithTitle:headerName
                                    action:NULL
@@ -197,7 +197,7 @@ class Observer : public chrome::BrowserListObserver,
 
   [[self menu] addItem:[NSMenuItem separatorItem]];
   item = [self createItemWithTitle:l10n_util::GetNSStringWithFixup(
-      IDS_NEW_PROFILES_CREATE_NEW_PROFILE_OPTION)
+      IDS_PROFILES_CREATE_NEW_PROFILE_OPTION)
                             action:@selector(newProfile:)];
   [[self menu] addItem:item];
 

chrome/browser/ui/webui/options/browser_options_handler.cc

@@ -293,9 +293,9 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
       IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON },
     { "profileAddPersonEnable", IDS_PROFILE_ADD_PERSON_ENABLE },
     { "profileBrowserGuestEnable", IDS_PROFILE_BROWSER_GUEST_ENABLE },
-    { "profilesCreate", IDS_NEW_PROFILES_CREATE_BUTTON_LABEL },
-    { "profilesDelete", IDS_NEW_PROFILES_DELETE_BUTTON_LABEL },
-    { "profilesDeleteSingle", IDS_NEW_PROFILES_DELETE_SINGLE_BUTTON_LABEL },
+    { "profilesCreate", IDS_PROFILES_CREATE_BUTTON_LABEL },
+    { "profilesDelete", IDS_PROFILES_DELETE_BUTTON_LABEL },
+    { "profilesDeleteSingle", IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL },
     { "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT },
     { "profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL },
     { "profilesSupervisedDashboardTip",
@@ -317,7 +317,7 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
       IDS_OPTIONS_SAFEBROWSING_ENABLE_EXTENDED_REPORTING },
     { "sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME },
     { "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME },
-    { "sectionTitleUsers", IDS_NEW_PROFILES_OPTIONS_GROUP_NAME },
+    { "sectionTitleUsers", IDS_PROFILES_OPTIONS_GROUP_NAME },
     { "sectionTitleProxy", IDS_OPTIONS_PROXY_GROUP_NAME },
     { "sectionTitleSearch", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME },
     { "sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME },

chrome/browser/ui/webui/options/manage_profile_handler.cc

@@ -97,16 +97,16 @@ void ManageProfileHandler::GetLocalizedValues(
     { "manageProfilesSupervisedSignInAgainLink",
         IDS_PROFILES_CREATE_SUPERVISED_SIGN_IN_AGAIN_LINK },
     { "manageProfilesConfirm", IDS_SAVE },
-    { "deleteProfileTitle", IDS_NEW_PROFILES_DELETE_TITLE },
-    { "deleteProfileOK", IDS_NEW_PROFILES_DELETE_OK_BUTTON_LABEL },
-    { "deleteProfileMessage", IDS_NEW_PROFILES_DELETE_MESSAGE },
+    { "deleteProfileTitle", IDS_PROFILES_DELETE_TITLE },
+    { "deleteProfileOK", IDS_PROFILES_DELETE_OK_BUTTON_LABEL },
+    { "deleteProfileMessage", IDS_PROFILES_DELETE_MESSAGE },
     { "deleteSupervisedProfileAddendum",
         IDS_PROFILES_DELETE_SUPERVISED_ADDENDUM },
     { "disconnectManagedProfileTitle",
         IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_TITLE },
     { "disconnectManagedProfileOK",
         IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_OK_BUTTON_LABEL },
-    { "createProfileTitle", IDS_NEW_PROFILES_CREATE_TITLE },
+    { "createProfileTitle", IDS_PROFILES_CREATE_TITLE },
     { "createProfileInstructions", IDS_PROFILES_CREATE_INSTRUCTIONS },
     { "createProfileConfirm", IDS_ADD },
     { "createProfileShortcutCheckbox", IDS_PROFILES_CREATE_SHORTCUT_CHECKBOX },
@@ -117,10 +117,8 @@ void ManageProfileHandler::GetLocalizedValues(
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
-  RegisterTitle(localized_strings, "manageProfile",
-                IDS_NEW_PROFILES_MANAGE_TITLE);
-  RegisterTitle(localized_strings, "createProfile",
-                IDS_NEW_PROFILES_CREATE_TITLE);
+  RegisterTitle(localized_strings, "manageProfile", IDS_PROFILES_MANAGE_TITLE);
+  RegisterTitle(localized_strings, "createProfile", IDS_PROFILES_CREATE_TITLE);
 
   localized_strings->SetBoolean("profileShortcutsEnabled",
                                 ProfileShortcutManager::IsFeatureEnabled());