Based off 20656002

ui/app_list/cocoa/app_list_view_controller.mm

Index: ui/app_list/cocoa/app_list_view_controller.mm
diff --git a/ui/app_list/cocoa/app_list_view_controller.mm b/ui/app_list/cocoa/app_list_view_controller.mm
index 5b36f4e71ebecf0d8752ab8b7309f4087e79986f..90dcc623f483224d1e2f8c790dd5720dc1b739ef 100644
--- a/ui/app_list/cocoa/app_list_view_controller.mm
+++ b/ui/app_list/cocoa/app_list_view_controller.mm
@@ -43,6 +43,16 @@ const CGFloat kMaxSegmentWidth = 80;
 // Duration of the animation for sliding in and out search results.
 const NSTimeInterval kResultsAnimationDuration = 0.2;
 
+app_list::AppListModel::User* CurrentUser(app_list::AppListModel* model) {
+  app_list::AppListModel::Users::const_iterator it = model->users().begin();
+  for (; it != model->users().end(); ++it) {
+    if ((*it)->active)
+      return *it;
+  }
+  NOTREACHED();
+  return NULL;
+}
+
 }  // namespace
 
 @interface BackgroundView : FlippedView;
@@ -88,7 +98,7 @@ class AppListModelObserverBridge : public AppListModelObserver {
 
  private:
   // Overridden from app_list::AppListModelObserver:
-  virtual void OnAppListModelCurrentUserChanged() OVERRIDE;
+  virtual void OnAppListModelUsersChanged() OVERRIDE;
   virtual void OnAppListModelSigninStatusChanged() OVERRIDE;
 
   AppListViewController* parent_;  // Weak. Owns us.
@@ -106,7 +116,7 @@ AppListModelObserverBridge::~AppListModelObserverBridge() {
   [[parent_ appsGridController] model]->RemoveObserver(this);
 }
 
-void AppListModelObserverBridge::OnAppListModelCurrentUserChanged() {
+void AppListModelObserverBridge::OnAppListModelUsersChanged() {
   [parent_ onSigninStatusChanged];
 }
 
@@ -324,12 +334,12 @@ void AppListModelObserverBridge::OnAppListModelSigninStatusChanged() {
 
 - (NSString*)currentUserName {
   return base::SysUTF16ToNSString(
-      [appsGridController_ model]->current_user_name());
+      CurrentUser([appsGridController_ model])->name);
 }
 
 - (NSString*)currentUserEmail {
   return base::SysUTF16ToNSString(
-      [appsGridController_ model]->current_user_email());
+      CurrentUser([appsGridController_ model])->email);
 }
 
 - (void)openResult:(app_list::SearchResult*)result {