Add profile selector menu to app list.

ui/app_list/cocoa/apps_search_box_controller.mm

 // Copyright 2013 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 "ui/app_list/cocoa/apps_search_box_controller.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "grit/ui_resources.h"
 #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h"
 #include "ui/app_list/app_list_menu.h"
-#import "ui/app_list/cocoa/current_user_menu_item_view.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/app_list/search_box_model_observer.h"
 #import "ui/base/cocoa/controls/hover_image_menu_button.h"
 #import "ui/base/cocoa/controls/hover_image_menu_button_cell.h"
 #import "ui/base/cocoa/menu_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 
 namespace {
 
@@ skipping 146 matching lines @@
   appListMenu_.reset();
   bridge_.reset();  // Ensure observers are cleared before updating |delegate_|.
   delegate_ = delegate;
   if (!delegate_)
     return;
 
   bridge_.reset(new app_list::SearchBoxModelObserverBridge(self));
   if (![delegate_ appListDelegate])
     return;
 
-  appListMenu_.reset(new app_list::AppListMenu([delegate_ appListDelegate]));
+  appListMenu_.reset(
+      new app_list::AppListMenu([delegate_ appListDelegate],
+                                [delegate_ appListModel]->users()));

[tapted, 2013/09/16 20:46:44]

nit: since it is dereferenced here, app_list_model.h should be in #includes for
the .cc

[calamity, 2013/09/17 00:09:26]

Done.

   [self rebuildMenu];
 }
 
 - (NSTextField*)searchTextField {
   return searchTextField_;
 }
 
 - (NSPopUpButton*)menuControl {
   return menuButton_;
 }
@@ skipping 174 matching lines @@
   // Need to initialze super with a NULL model, otherwise it will immediately
   // try to populate, which can't be done until setting the parent.
   if ((self = [super initWithModel:NULL
             useWithPopUpButtonCell:YES])) {
     searchBoxController_ = parent;
     [super setModel:[parent appListMenu]->menu_model()];
   }
   return self;
 }
 
-- (void)addItemToMenu:(NSMenu*)menu
-              atIndex:(NSInteger)index
-            fromModel:(ui::MenuModel*)model {
-  [super addItemToMenu:menu
-               atIndex:index
-             fromModel:model];
-  if (model->GetCommandIdAt(index) != app_list::AppListMenu::CURRENT_USER)
-    return;
-
-  base::scoped_nsobject<NSView> customItemView([[CurrentUserMenuItemView alloc]
-      initWithCurrentUser:[[searchBoxController_ delegate] currentUserName]
-                userEmail:[[searchBoxController_ delegate] currentUserEmail]]);
-  [[menu itemAtIndex:index] setView:customItemView];
-}
-
 - (NSRect)confinementRectForMenu:(NSMenu*)menu
                         onScreen:(NSScreen*)screen {
   NSPopUpButton* menuButton = [searchBoxController_ menuControl];
   // Ensure the menu comes up below the menu button by trimming the window frame
   // to a point anchored below the bottom right of the button.
   NSRect anchorRect = [menuButton convertRect:[menuButton bounds]
                                        toView:nil];
   NSPoint anchorPoint = [[menuButton window] convertBaseToScreen:NSMakePoint(
       NSMaxX(anchorRect) + kMenuXOffsetFromButton,
       NSMinY(anchorRect) - kMenuYOffsetFromButton)];
   NSRect confinementRect = [[menuButton window] frame];
   confinementRect.size = NSMakeSize(anchorPoint.x - NSMinX(confinementRect),
                                     anchorPoint.y - NSMinY(confinementRect));
   return confinementRect;
 }
 
 @end