Move signin status and current user information into AppListModel.

ui/app_list/cocoa/app_list_view_controller.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/app_list_view_controller.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/string_util.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_model.h"
+#include "ui/app_list/app_list_model_observer.h"
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/signin_delegate.h"
-#include "ui/app_list/signin_delegate_observer.h"
 #import "ui/app_list/cocoa/app_list_pager_view.h"
 #import "ui/app_list/cocoa/apps_grid_controller.h"
 #import "ui/app_list/cocoa/signin_view_controller.h"
 #import "ui/base/cocoa/flipped_view.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 namespace {
 
 // The roundedness of the corners of the bubble.
@@ skipping 43 matching lines @@
   [gfx::SkColorToSRGBNSColor(app_list::kTopSeparatorColor) set];
   NSRectFill(separatorRect);
 }
 
 @end
 
 @interface AppListViewController ()
 
 - (void)loadAndSetView;
 - (void)revealSearchResults:(BOOL)show;
 - (app_list::SigninDelegate*)signinDelegate;

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

Remove this function?

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

Done.

 
 @end
 
 namespace app_list {
 
-class SigninDelegateObserverBridge : public SigninDelegateObserver {
+class AppListModelObserverBridge : public AppListModelObserver {
  public:
-  SigninDelegateObserverBridge(AppListViewController* parent)
-      : parent_(parent) {
-    [parent_ signinDelegate]->AddObserver(this);
-  }
-
-  virtual ~SigninDelegateObserverBridge() {
-    [parent_ signinDelegate]->RemoveObserver(this);
-  }
+  AppListModelObserverBridge(AppListModel* model,
+                             AppListViewController* parent);
+  virtual ~AppListModelObserverBridge();
 
  private:
-  // SigninDelegateObserver override:
-  virtual void OnSigninSuccess() OVERRIDE {
-    [parent_ onSigninStatusChanged];
-  }
+  // Overridden from app_list::AppListModelObserver:
+  virtual void OnAppListModelCurrentUserChanged() OVERRIDE;
+  virtual void OnAppListModelSigninStatusChanged() OVERRIDE;
 
+  AppListModel* model_;

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

prevailing style on the Cocoa side is to not cache things you can infer from
other members. You can get to the model reliably with

[[parent_ appsGridController] model]

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

Done.

   AppListViewController* parent_;  // Weak. Owns us.
 
-  DISALLOW_COPY_AND_ASSIGN(SigninDelegateObserverBridge);
+  DISALLOW_COPY_AND_ASSIGN(AppListModelObserverBridge);
 };
 
+AppListModelObserverBridge::AppListModelObserverBridge(
+    AppListModel* model, AppListViewController* parent)
+    : model_(model), parent_(parent) {
+  model_->AddObserver(this);
+}
+
+AppListModelObserverBridge::~AppListModelObserverBridge() {
+  model_->RemoveObserver(this);
+}
+
+void AppListModelObserverBridge::OnAppListModelCurrentUserChanged() {
+  [parent_ onSigninStatusChanged];
+}
+
+void AppListModelObserverBridge::OnAppListModelSigninStatusChanged() {
+  [parent_ onSigninStatusChanged];
+}
+
 }  // namespace app_list
 
 @implementation AppListViewController
 
 - (id)init {
   if ((self = [super init])) {
     appsGridController_.reset([[AppsGridController alloc] init]);
     [self loadAndSetView];
 
     [self totalPagesChanged];
@@ skipping 25 matching lines @@
 }
 
 - (app_list::AppListViewDelegate*)delegate {
   return delegate_.get();
 }
 
 - (void)setDelegate:(scoped_ptr<app_list::AppListViewDelegate>)newDelegate
       withTestModel:(scoped_ptr<app_list::AppListModel>)newModel {
   if (delegate_) {
     // First clean up, in reverse order.
-    signin_observer_bridge_.reset();
+    app_list_model_observer_bridge_.reset();
     [appsSearchResultsController_ setDelegate:nil];
     [appsSearchBoxController_ setDelegate:nil];
   }
   delegate_.reset(newDelegate.release());
   [appsGridController_ setDelegate:delegate_.get()];
   if (newModel.get())
     [appsGridController_ setModel:newModel.Pass()];
   [appsSearchBoxController_ setDelegate:self];
   [appsSearchResultsController_ setDelegate:self];
+  app_list_model_observer_bridge_.reset(
+      new app_list::AppListModelObserverBridge(
+          [appsGridController_ model], self));
   [self onSigninStatusChanged];
 }
 
 - (void)setDelegate:(scoped_ptr<app_list::AppListViewDelegate>)newDelegate {
   [self setDelegate:newDelegate.Pass()
       withTestModel:scoped_ptr<app_list::AppListModel>()];
 }
 
 -(void)loadAndSetView {
   pagerControl_.reset([[AppListPagerView alloc] init]);
@@ skipping 143 matching lines @@
     delegate_->OpenSearchResult(result, 0 /* event flags */);
 
   [appsSearchBoxController_ clearSearch];
 }
 
 - (void)onSigninStatusChanged {
   app_list::SigninDelegate* signinDelegate = [self signinDelegate];
   BOOL needsSignin = signinDelegate && signinDelegate->NeedSignin();
   if (!needsSignin) {
     [[signinViewController_ view] removeFromSuperview];
-    signin_observer_bridge_.reset();
     signinViewController_.reset();
     [backgroundView_ setHidden:NO];
     return;
   }
 
   [backgroundView_ setHidden:YES];
   signinViewController_.reset(
       [[SigninViewController alloc] initWithFrame:[backgroundView_ frame]
                                      cornerRadius:kBubbleCornerRadius
                                          delegate:signinDelegate]);
-  signin_observer_bridge_.reset(
-      new app_list::SigninDelegateObserverBridge(self));
   [[self view] addSubview:[signinViewController_ view]];
 }
 
 - (app_list::SigninDelegate*)signinDelegate {
   return delegate_ ? delegate_->GetSigninDelegate() : NULL;
 }
 
+- (const base::string16&)currentUserName {

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

nit: These should be grouped with the other protocol methods - i.e. after
modelTextDidChange

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

Done.

+  return [appsGridController_ model]->current_user_name();
+}
+
+- (const base::string16&)currentUserEmail {
+  return [appsGridController_ model]->current_user_email();
+}
+
 @end