Based off 20656002

ui/app_list/cocoa/app_list_view_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/app_list_view_controller.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "skia/ext/skia_utils_mac.h"
@@ skipping 25 matching lines @@
 
 // Minimum margin on either side of the pager. If the pager grows beyond this,
 // the segment size is reduced.
 const CGFloat kMinPagerMargin = 40;
 // Maximum width of a single segment.
 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;
 @end
 
 @implementation BackgroundView
 
 - (void)drawRect:(NSRect)dirtyRect {
   gfx::ScopedNSGraphicsContextSaveGState context;
   NSRect boundsRect = [self bounds];
@@ skipping 25 matching lines @@
 
 namespace app_list {
 
 class AppListModelObserverBridge : public AppListModelObserver {
  public:
   AppListModelObserverBridge(AppListViewController* parent);
   virtual ~AppListModelObserverBridge();
 
  private:
   // Overridden from app_list::AppListModelObserver:
-  virtual void OnAppListModelCurrentUserChanged() OVERRIDE;
+  virtual void OnAppListModelUsersChanged() OVERRIDE;
   virtual void OnAppListModelSigninStatusChanged() OVERRIDE;
 
   AppListViewController* parent_;  // Weak. Owns us.
 
   DISALLOW_COPY_AND_ASSIGN(AppListModelObserverBridge);
 };
 
 AppListModelObserverBridge::AppListModelObserverBridge(
     AppListViewController* parent)
     : parent_(parent) {
   [[parent_ appsGridController] model]->AddObserver(this);
 }
 
 AppListModelObserverBridge::~AppListModelObserverBridge() {
   [[parent_ appsGridController] model]->RemoveObserver(this);
 }
 
-void AppListModelObserverBridge::OnAppListModelCurrentUserChanged() {
+void AppListModelObserverBridge::OnAppListModelUsersChanged() {
   [parent_ onSigninStatusChanged];
 }
 
 void AppListModelObserverBridge::OnAppListModelSigninStatusChanged() {
   [parent_ onSigninStatusChanged];
 }
 
 }  // namespace app_list
 
 @implementation AppListViewController
@@ skipping 197 matching lines @@
   else
     delegate_->StopSearch();
 }
 
 - (app_list::AppListModel*)appListModel {
   return [appsGridController_ model];
 }
 
 - (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 {
   if (delegate_)
     delegate_->OpenSearchResult(result, 0 /* event flags */);
 
   [appsSearchBoxController_ clearSearch];
 }
 
 - (void)redoSearch {
@@ skipping 18 matching lines @@
 
   [backgroundView_ setHidden:YES];
   signinViewController_.reset(
       [[SigninViewController alloc] initWithFrame:[backgroundView_ frame]
                                      cornerRadius:kBubbleCornerRadius
                                          delegate:signinDelegate]);
   [[self view] addSubview:[signinViewController_ view]];
 }
 
 @end