1 files changed, 6 insertions, 19 deletions
diff --git a/chromium/ui/app_list/cocoa/apps_search_box_controller.mm b/chromium/ui/app_list/cocoa/apps_search_box_controller.mm
index 4f02a20c56b..2fa9928b207 100644
--- a/chromium/ui/app_list/cocoa/apps_search_box_controller.mm
+++ b/chromium/ui/app_list/cocoa/apps_search_box_controller.mm
@@ -10,7 +10,7 @@
 #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/app_list_model.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"
@@ -110,6 +110,7 @@ void SearchBoxModelObserverBridge::TextChanged() {
   // it is changed in tests to establish a particular state.
   [[parent_ searchTextField]
       setStringValue:base::SysUTF16ToNSString(GetModel()->text())];
+  [[parent_ delegate] modelTextDidChange];
 }
 
 }  // namespace app_list
@@ -158,6 +159,10 @@ void SearchBoxModelObserverBridge::TextChanged() {
   if (![delegate_ appListDelegate])
     return;
 
+  [menuController_ setModel:NULL];
+  appListMenu_.reset(
+      new app_list::AppListMenu([delegate_ appListDelegate],
+                                [delegate_ appListModel]->users()));
   menuController_.reset([[AppListMenuController alloc]
       initWithSearchBoxController:self]);
   [menuButton_ setMenu:[menuController_ menu]];  // Menu will populate here.
@@ -173,10 +178,6 @@ void SearchBoxModelObserverBridge::TextChanged() {
     return;
 
   bridge_.reset(new app_list::SearchBoxModelObserverBridge(self));
-  if (![delegate_ appListDelegate])
-    return;
-
-  appListMenu_.reset(new app_list::AppListMenu([delegate_ appListDelegate]));
   [self rebuildMenu];
 }
 
@@ -371,20 +372,6 @@ void SearchBoxModelObserverBridge::TextChanged() {
   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]
-      initWithDelegate:[[searchBoxController_ delegate] appListDelegate]]);
-  [[menu itemAtIndex:index] setView:customItemView];
-}
-
 - (NSRect)confinementRectForMenu:(NSMenu*)menu
                         onScreen:(NSScreen*)screen {
   NSPopUpButton* menuButton = [searchBoxController_ menuControl];