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 863e25e55df8ed22c06c2754746e4cb85b65f187..6735f049b867535b74f38cba5c457a04e93258ff 100644 |
--- a/ui/app_list/views/app_list_view.cc |
+++ b/ui/app_list/views/app_list_view.cc |
@@ -50,15 +50,12 @@ AppListView::AppListView(AppListViewDelegate* delegate) |
app_list_main_view_(NULL), |
signin_view_(NULL) { |
if (delegate_) |
- delegate_->SetModel(model_.get()); |
- if (GetSigninDelegate()) |
- GetSigninDelegate()->AddObserver(this); |
+ delegate_->InitModel(model_.get()); |
+ model_->AddObserver(this); |
} |
AppListView::~AppListView() { |
- if (GetSigninDelegate()) |
- GetSigninDelegate()->RemoveObserver(this); |
- |
+ model_->RemoveObserver(this); |
// Models are going away, ensure their references are cleared. |
RemoveAllChildViews(true); |
} |
@@ -81,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_); |
@@ -174,11 +172,8 @@ void AppListView::Prerender() { |
} |
void AppListView::OnSigninStatusChanged() { |
- const bool needs_signin = |
- GetSigninDelegate() && GetSigninDelegate()->NeedSignin(); |
- |
- signin_view_->SetVisible(needs_signin); |
- app_list_main_view_->SetVisible(!needs_signin); |
+ signin_view_->SetVisible(!model_->signed_in()); |
+ app_list_main_view_->SetVisible(model_->signed_in()); |
app_list_main_view_->search_box_view()->InvalidateMenu(); |
} |
@@ -255,12 +250,12 @@ void AppListView::OnWidgetVisibilityChanged(views::Widget* widget, |
Layout(); |
} |
-void AppListView::OnSigninSuccess() { |
+void AppListView::OnAppListModelSigninStatusChanged() { |
OnSigninStatusChanged(); |
} |
-SigninDelegate* AppListView::GetSigninDelegate() { |
- return delegate_ ? delegate_->GetSigninDelegate() : NULL; |
+void AppListView::OnAppListModelProfilesChanged() { |
+ OnSigninStatusChanged(); |
} |
} // namespace app_list |