| 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..f00da9c742b7a0c1a4240f49a66161a54503fa1b 100644
|
| --- a/ui/app_list/cocoa/app_list_view_controller.mm
|
| +++ b/ui/app_list/cocoa/app_list_view_controller.mm
|
| @@ -88,7 +88,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 +106,7 @@ AppListModelObserverBridge::~AppListModelObserverBridge() {
|
| [[parent_ appsGridController] model]->RemoveObserver(this);
|
| }
|
|
|
| -void AppListModelObserverBridge::OnAppListModelCurrentUserChanged() {
|
| +void AppListModelObserverBridge::OnAppListModelUsersChanged() {
|
| [parent_ onSigninStatusChanged];
|
| }
|
|
|
| @@ -322,16 +322,6 @@ void AppListModelObserverBridge::OnAppListModelSigninStatusChanged() {
|
| return [appsGridController_ model];
|
| }
|
|
|
| -- (NSString*)currentUserName {
|
| - return base::SysUTF16ToNSString(
|
| - [appsGridController_ model]->current_user_name());
|
| -}
|
| -
|
| -- (NSString*)currentUserEmail {
|
| - return base::SysUTF16ToNSString(
|
| - [appsGridController_ model]->current_user_email());
|
| -}
|
| -
|
| - (void)openResult:(app_list::SearchResult*)result {
|
| if (delegate_)
|
| delegate_->OpenSearchResult(result, 0 /* event flags */);
|
|
|