Add profile selector menu to app list.

ui/app_list/app_list_model.h

 // 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.
 
 #ifndef UI_APP_LIST_APP_LIST_MODEL_H_
 #define UI_APP_LIST_APP_LIST_MODEL_H_
 
+#include <vector>
+
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
+#include "base/strings/string16.h"
 #include "ui/app_list/app_list_export.h"
 #include "ui/base/models/list_model.h"
 
+namespace ui{

[tapted, 2013/07/31 05:43:53]

nit: space before {

[calamity, 2013/08/01 08:35:45]

Done.

+struct AvatarMenuItemModel;
+}
+
 namespace app_list {
 
 class AppListItemModel;
 class AppListModelObserver;
 class SearchBoxModel;
 class SearchResult;
 
 // Master model of app list that consists of three sub models: Apps,
 // SearchBoxModel and SearchResults. The Apps sub model owns a list of
 // AppListItemModel and is displayed in the grid view. SearchBoxModel is
 // the model for SearchBoxView. SearchResults owns a list of SearchResult.
 class APP_LIST_EXPORT AppListModel {
  public:
   enum Status {
     STATUS_NORMAL,
     STATUS_SYNCING,  // Syncing apps or installing synced apps.
   };
 
   typedef ui::ListModel<AppListItemModel> Apps;
   typedef ui::ListModel<SearchResult> SearchResults;
 
   AppListModel();
   ~AppListModel();
 
   void AddObserver(AppListModelObserver* observer);
   void RemoveObserver(AppListModelObserver* observer);
 
   void SetStatus(Status status);
+  void SetCurrentUser(string16 user_name, string16 user_email);

[tapted, 2013/07/31 05:43:53]

nit: const-reference args for strings

[calamity, 2013/08/01 08:35:45]

Done.

 
   Apps* apps() { return apps_.get(); }
   SearchBoxModel* search_box() { return search_box_.get(); }
   SearchResults* results() { return results_.get(); }
   Status status() const { return status_; }
 
+  string16 current_user_name() { return current_user_name_; }

[tapted, 2013/07/31 05:43:53]

I've seen new code using base::string16 a lot more - I think there's an effort
to disallow access to string16 without using the base:: namespace.

[calamity, 2013/08/01 08:35:45]

Done.

+  string16 current_user_email() { return current_user_email_; }

[tapted, 2013/07/31 05:43:53]

Also, most app list code returns const-references for accessors like these. See,
e.g., app_list::SearchResult. The exception is if the "accessor" is a virtual
function.

[calamity, 2013/08/01 08:35:45]

Done.

+
+  std::vector<ui::AvatarMenuItemModel*>& avatar_menu_items() {
+    return avatar_menu_items_;
+  }
+
  private:
   scoped_ptr<Apps> apps_;
 
   scoped_ptr<SearchBoxModel> search_box_;
   scoped_ptr<SearchResults> results_;
 
+  string16 current_user_name_;
+  string16 current_user_email_;
+  std::vector<ui::AvatarMenuItemModel*> avatar_menu_items_;

[tapted, 2013/07/31 05:43:53]

a thought: you could also use a ScopedVector - not sure what the prevailing
style is though, or if it will conflict with the way it's currently used in
AvatarMenuModel. Perhaps due to changes there it would be better to investigate
orthogonal to this CL anyway.

[calamity, 2013/08/01 08:35:45]

Also might be worth using a ui::ListModel since it has observer support. I'll
see if it's at all useful to do so...

+
   Status status_;
   ObserverList<AppListModelObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListModel);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_APP_LIST_MODEL_H_