Revert 95434 - Multi-Profiles: Update strings

chrome/browser/ui/profile_menu_model.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/profile_menu_model.h"
 
 #include "base/path_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 56 matching lines @@
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   size_t count = cache.GetNumberOfProfiles();
   for (size_t i = 0; i < count; ++i) {
     AddCheckItem(ProfileMenuModel::COMMAND_SWITCH_TO_PROFILE + i,
                  cache.GetNameOfProfileAtIndex(i));
   }
 
   AddSeparator();
 
-  AddItemWithStringId(ProfileMenuModel::COMMAND_CREATE_NEW_PROFILE,
-                      IDS_PROFILES_CREATE_NEW_PROFILE_OPTION);
+  const string16 short_product_name =
+      l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME);
+  AddItem(ProfileMenuModel::COMMAND_CREATE_NEW_PROFILE,
+          l10n_util::GetStringFUTF16(IDS_PROFILES_CREATE_NEW_PROFILE_OPTION,
+                                     short_product_name));
 }
 
 void SwitchProfileMenuModel::ExecuteCommand(int command_id) {
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   if (IsSwitchProfileCommand(command_id)) {
     size_t index = GetProfileIndexFromSwitchProfileCommand(command_id);
     FilePath profile_path = cache.GetPathOfProfileAtIndex(index);
     ProfileSwitchObserver* observer = new ProfileSwitchObserver;
     // The observer is deleted by the manager when profile creation is finished.
@@ skipping 59 matching lines @@
 
   AddItemWithStringId(COMMAND_CUSTOMIZE_PROFILE,
                       IDS_PROFILES_CUSTOMIZE_PROFILE);
   AddSeparator();
 
   const string16 short_product_name =
       l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME);
   if (cache.GetNumberOfProfiles() > 1) {
     switch_profiles_sub_menu_model_.reset(
         new SwitchProfileMenuModel(this, browser_));
-    AddSubMenuWithStringId(COMMAND_SWITCH_PROFILE_MENU, IDS_PROFILES_MENU,
-                           switch_profiles_sub_menu_model_.get());
+    AddSubMenu(COMMAND_SWITCH_PROFILE_MENU, l10n_util::GetStringFUTF16(
+        IDS_PROFILES_MENU, short_product_name),
+        switch_profiles_sub_menu_model_.get());
   } else {
     switch_profiles_sub_menu_model_.reset();
     AddItem(COMMAND_CREATE_NEW_PROFILE, l10n_util::GetStringFUTF16(
         IDS_PROFILES_CREATE_NEW_PROFILE_OPTION, short_product_name));
   }
 }
 
 ProfileMenuModel::~ProfileMenuModel() {
 }
 
@@ skipping 24 matching lines @@
     case COMMAND_CHOOSE_AVATAR_ICON:
       break;
     case COMMAND_CREATE_NEW_PROFILE:
       ProfileManager::CreateMultiProfileAsync();
       break;
     default:
       NOTREACHED();
       break;
   }
 }