Move signin status and current user information into AppListModel.

ui/app_list/views/app_list_view.cc

 // Copyright (c) 2012 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.
 
 #include "ui/app_list/views/app_list_view.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_model.h"
@@ skipping 33 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // AppListView:
 
 AppListView::AppListView(AppListViewDelegate* delegate)
     : model_(new AppListModel),
       delegate_(delegate),
       app_list_main_view_(NULL),
       signin_view_(NULL) {
   if (delegate_)
     delegate_->SetModel(model_.get());
-  if (GetSigninDelegate())
-    GetSigninDelegate()->AddObserver(this);
+  model_->AddObserver(this);
 }
 
 AppListView::~AppListView() {
-  if (GetSigninDelegate())
-    GetSigninDelegate()->RemoveObserver(this);
-
+  model_->RemoveObserver(this);
   // Models are going away, ensure their references are cleared.
   RemoveAllChildViews(true);
 }
 
 void AppListView::InitAsBubble(gfx::NativeView parent,
                                PaginationModel* pagination_model,
                                views::View* anchor,
                                const gfx::Point& anchor_point,
                                views::BubbleBorder::Arrow arrow,
                                bool border_accepts_events) {
@@ skipping 95 matching lines @@
 
 bool AppListView::ShouldHandleSystemCommands() const {
   return true;
 }
 
 void AppListView::Prerender() {
   app_list_main_view_->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();
 }
 
 views::View* AppListView::GetInitiallyFocusedView() {
   return app_list_main_view_->search_box_view()->search_box();
 }
 
 gfx::ImageSkia AppListView::GetWindowIcon() {
   if (delegate_)
     return delegate_->GetWindowIcon();
@@ skipping 56 matching lines @@
   // We clear the search when hiding so the next time the app list appears it is
   // not showing search results.
   if (!visible)
     app_list_main_view_->search_box_view()->ClearSearch();
 
   // Whether we need to signin or not may have changed since last time we were
   // shown.
   Layout();
 }
 
-void AppListView::OnSigninSuccess() {
-  OnSigninStatusChanged();
-}
-
 SigninDelegate* AppListView::GetSigninDelegate() {
   return delegate_ ? delegate_->GetSigninDelegate() : NULL;
 }
 
+void AppListView::OnAppListModelSigninStatusChanged() {
+  OnSigninStatusChanged();
+}
+
+void AppListView::OnAppListModelCurrentUserChanged() {
+  OnSigninStatusChanged();
+}
+
 }  // namespace app_list