| Index: ui/app_list/views/app_list_view.cc
|
| diff --git a/ui/app_list/views/app_list_view.cc b/ui/app_list/views/app_list_view.cc
|
| index 0f4027834e0a2fdec675d7f39193f1f9ec67d98f..b8fb81d5599d6cb10006bf5975a30e7aedcdb630 100644
|
| --- a/ui/app_list/views/app_list_view.cc
|
| +++ b/ui/app_list/views/app_list_view.cc
|
| @@ -50,7 +50,7 @@ AppListView::AppListView(AppListViewDelegate* delegate)
|
| app_list_main_view_(NULL),
|
| signin_view_(NULL) {
|
| if (delegate_)
|
| - delegate_->SetModel(model_.get());
|
| + delegate_->InitModel(model_.get());
|
| model_->AddObserver(this);
|
| }
|
|
|
| @@ -78,7 +78,8 @@ void AppListView::InitAsBubble(gfx::NativeView parent,
|
| #endif
|
|
|
| signin_view_ = new SigninView(
|
| - GetSigninDelegate(),
|
| + delegate_ ? delegate_->GetSigninDelegate()
|
| + : NULL,
|
| app_list_main_view_->GetPreferredSize().width());
|
| AddChildView(signin_view_);
|
|
|
| @@ -249,10 +250,6 @@ void AppListView::OnWidgetVisibilityChanged(views::Widget* widget,
|
| Layout();
|
| }
|
|
|
| -SigninDelegate* AppListView::GetSigninDelegate() {
|
| - return delegate_ ? delegate_->GetSigninDelegate() : NULL;
|
| -}
|
| -
|
| void AppListView::OnAppListModelSigninStatusChanged() {
|
| OnSigninStatusChanged();
|
| }
|
| @@ -261,4 +258,8 @@ void AppListView::OnAppListModelCurrentUserChanged() {
|
| OnSigninStatusChanged();
|
| }
|
|
|
| +void AppListView::OnAppListModelProfileMenuItemsChanged() {
|
| + OnSigninStatusChanged();
|
| +}
|
| +
|
| } // namespace app_list
|
|
|