Move signin status and current user information into AppListModel.

ui/app_list/cocoa/current_user_menu_item_view.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/current_user_menu_item_view.h"
 
 #include "base/logging.h"

[tapted, 2013/08/14 03:53:11]

nit: I think this can go too, with the DCHECK being deleted

[calamity, 2013/08/14 09:19:00]

Done.

 #include "base/mac/scoped_nsobject.h"
-#include "base/strings/sys_string_conversions.h"
 #include "grit/ui_resources.h"
-#include "ui/app_list/app_list_view_delegate.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
 // Padding on the left of the indicator icon.
 const CGFloat kMenuLeftMargin = 3;
 
 }
 
 @interface CurrentUserMenuItemView ()
 
 // Adds a text label in the custom view in the menu showing the current user.
 - (NSTextField*)addLabelWithFrame:(NSPoint)origin
-                        labelText:(const string16&)labelText;
+                        labelText:(const base::string16&)labelText;
 
 @end
 
 @implementation CurrentUserMenuItemView
 
-- (id)initWithDelegate:(app_list::AppListViewDelegate*)delegate {
-  DCHECK(delegate);
+- (id)initWithCurrentUser:(const base::string16&)userName
+                userEmail:(const base::string16&)userEmail {
   if ((self = [super initWithFrame:NSZeroRect])) {
     NSImage* userImage = ui::ResourceBundle::GetSharedInstance().
         GetNativeImageNamed(IDR_APP_LIST_USER_INDICATOR).AsNSImage();
     NSRect imageRect = NSMakeRect(kMenuLeftMargin, 0, 0, 0);
     imageRect.size = [userImage size];
     base::scoped_nsobject<NSImageView> userImageView(
         [[NSImageView alloc] initWithFrame:imageRect]);
     [userImageView setImage:userImage];
     [self addSubview:userImageView];
 
     NSPoint labelOrigin = NSMakePoint(NSMaxX(imageRect), 0);
     NSTextField* userField =
         [self addLabelWithFrame:labelOrigin
-                      labelText:delegate->GetCurrentUserName()];
+                      labelText:userName];
 
     labelOrigin.y = NSMaxY([userField frame]);
     NSTextField* emailField =
         [self addLabelWithFrame:labelOrigin
-                      labelText:delegate->GetCurrentUserEmail()];
+                      labelText:userEmail];
     [emailField setTextColor:[NSColor disabledControlTextColor]];
 
     // Size the container view to fit the longest label.
     NSRect labelFrame = [emailField frame];
     if (NSWidth([userField frame]) > NSWidth(labelFrame))
       labelFrame.size.width = NSWidth([userField frame]);
     [self setFrameSize:NSMakeSize(
         NSMaxX(labelFrame) + NSMaxX(imageRect),
         NSMaxY(labelFrame))];
   }
   return self;
 }
 
 - (NSTextField*)addLabelWithFrame:(NSPoint)origin
-                        labelText:(const string16&)labelText {
+                        labelText:(const base::string16&)labelText {

[tapted, 2013/08/14 03:53:11]

NSString* for everyone!

[calamity, 2013/08/14 09:19:00]

Done.

   NSRect labelFrame = NSZeroRect;
   labelFrame.origin = origin;
   base::scoped_nsobject<NSTextField> label(
       [[NSTextField alloc] initWithFrame:labelFrame]);
   [label setStringValue:base::SysUTF16ToNSString(labelText)];
   [label setEditable:NO];
   [label setBordered:NO];
   [label setDrawsBackground:NO];
   [label setFont:[NSFont menuFontOfSize:0]];
   [label sizeToFit];
   [self addSubview:label];
   return label.autorelease();
 }
 
 - (BOOL)isFlipped {
   return YES;
 }
 
 @end