[Merge] User Person/People instead of User/Users everywhere profile related.

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

 // Copyright 2014 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.
 
 #import "chrome/browser/ui/cocoa/profiles/profile_menu_controller.h"
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu.h"
@@ skipping 52 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
 @implementation ProfileMenuController
 
 - (id)initWithMainMenuItem:(NSMenuItem*)item {
   if ((self = [super init])) {
     mainMenuItem_ = item;
 
     base::scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle:
-        l10n_util::GetNSStringWithFixup(switches::IsNewAvatarMenu() ?
-        IDS_NEW_PROFILES_OPTIONS_GROUP_NAME :
-        IDS_PROFILES_OPTIONS_GROUP_NAME)]);
+        l10n_util::GetNSStringWithFixup(IDS_NEW_PROFILES_OPTIONS_GROUP_NAME)]);
     [mainMenuItem_ setSubmenu:menu];
 
     // This object will be constructed as part of nib loading, which happens
     // before the message loop starts and g_browser_process is available.
     // Schedule this on the loop to do work when the browser is ready.
     [self performSelector:@selector(initializeMenu)
                withObject:nil
                afterDelay:0];
   }
   return self;
@@ skipping 19 matching lines @@
   menu_->AddNewProfile(ProfileMetrics::ADD_NEW_USER_MENU);
 }
 
 - (BOOL)insertItemsIntoMenu:(NSMenu*)menu
                    atOffset:(NSInteger)offset
                    fromDock:(BOOL)dock {
   if (!menu_ || !menu_->ShouldShowAvatarMenu())
     return NO;
 
   if (dock) {
-    NSString* headerName = l10n_util::GetNSStringWithFixup(
-        switches::IsNewAvatarMenu() ? IDS_NEW_PROFILES_OPTIONS_GROUP_NAME :
-                                      IDS_PROFILES_OPTIONS_GROUP_NAME);
+    NSString* headerName =
+        l10n_util::GetNSStringWithFixup(IDS_NEW_PROFILES_OPTIONS_GROUP_NAME);
     base::scoped_nsobject<NSMenuItem> header(
         [[NSMenuItem alloc] initWithTitle:headerName
                                    action:NULL
                             keyEquivalent:@""]);
     [header setEnabled:NO];
     [menu insertItem:header atIndex:offset++];
   }
 
   for (size_t i = 0; i < menu_->GetNumberOfItems(); ++i) {
     const AvatarMenu::Item& itemData = menu_->GetItemAt(i);
@@ skipping 58 matching lines @@
 - (void)initializeMenu {
   observer_.reset(new ProfileMenuControllerInternal::Observer(self));
   menu_.reset(new AvatarMenu(
       &g_browser_process->profile_manager()->GetProfileInfoCache(),
       observer_.get(),
       NULL));
   menu_->RebuildMenu();
 
   [[self menu] addItem:[NSMenuItem separatorItem]];
 
-  bool usingNewProfilesUI = switches::IsNewAvatarMenu();
-  NSString* editProfileTitle = l10n_util::GetNSStringWithFixup(
-      usingNewProfilesUI ? IDS_PROFILES_MANAGE_BUTTON_LABEL :
-                           IDS_PROFILES_CUSTOMIZE_PROFILE);
-  NSString* newProfileTitle = l10n_util::GetNSStringWithFixup(
-      usingNewProfilesUI ? IDS_NEW_PROFILES_CREATE_NEW_PROFILE_OPTION :
-                           IDS_PROFILES_CREATE_NEW_PROFILE_OPTION);
-
-  NSMenuItem* item = [self createItemWithTitle:editProfileTitle
+  NSMenuItem* item = [self createItemWithTitle:
+      l10n_util::GetNSStringWithFixup(IDS_PROFILES_MANAGE_BUTTON_LABEL)
                                         action:@selector(editProfile:)];
   [[self menu] addItem:item];
 
   [[self menu] addItem:[NSMenuItem separatorItem]];
-  item = [self createItemWithTitle:newProfileTitle
+  item = [self createItemWithTitle:l10n_util::GetNSStringWithFixup(
+      IDS_NEW_PROFILES_CREATE_NEW_PROFILE_OPTION)
                             action:@selector(newProfile:)];
   [[self menu] addItem:item];
 
   [self rebuildMenu];
 }
 
 // Notifies the controller that the active browser has changed and that the
 // menu item and menu need to be updated to reflect that.
 - (void)activeBrowserChangedTo:(Browser*)browser {
   // Tell the menu that the browser has changed.
@@ skipping 39 matching lines @@
 }
 
 - (NSMenuItem*)createItemWithTitle:(NSString*)title action:(SEL)sel {
   base::scoped_nsobject<NSMenuItem> item(
       [[NSMenuItem alloc] initWithTitle:title action:sel keyEquivalent:@""]);
   [item setTarget:self];
   return [item.release() autorelease];
 }
 
 @end