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/files/file_path.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 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:
+  // A user of the app list.
+  struct User {
+    // Whether or not the app list is currently instantiated for this user.

[koz (OOO until 15th September), 2013/09/09 22:58:07]

Maybe "Whether or not this user is the current user of the app list." ?

[calamity, 2013/09/10 22:50:46]

Done.

+    bool active;

[tapted, 2013/09/10 00:29:26]

You should probably initialize |active| to something. Also llvm will whinge at
you that the constructor/destructor are not trivial and can't be
implicit/inlined.

[calamity, 2013/09/10 22:50:46]

Done.

+
+    // The name of this user.
+    string16 name;

[tapted, 2013/09/10 00:29:26]

nit: base::string16 unless there's a prevailing convention for string16 in this
file

[calamity, 2013/09/10 22:50:46]

Done.

+
+    // The email address of this user.
+    string16 email;
+
+    // The path to this user's profile directory.
+    base::FilePath profile_path;
+  };
+
   enum Status {
     STATUS_NORMAL,
     STATUS_SYNCING,  // Syncing apps or installing synced apps.
   };
 
   typedef ui::ListModel<AppListItemModel> Apps;
   typedef ui::ListModel<SearchResult> SearchResults;
+  typedef std::vector<User*> Users;

[koz (OOO until 15th September), 2013/09/09 22:58:07]

You should just use User here, not User*. This is a tiny amount of data so the
extra complexity of managing the lifetime is not worth the savings.

[calamity, 2013/09/10 22:50:46]

Done.

 
   AppListModel();
   ~AppListModel();
 
   void AddObserver(AppListModelObserver* observer);
   void RemoveObserver(AppListModelObserver* observer);
 
   void SetStatus(Status status);
-  void SetCurrentUser(const base::string16& current_user_name,
-                      const base::string16& current_user_email);
+  void SetUsers(const Users& profile_menu_items);
   void SetSignedIn(bool signed_in);
 
   Apps* apps() { return apps_.get(); }
   SearchBoxModel* search_box() { return search_box_.get(); }
   SearchResults* results() { return results_.get(); }
   Status status() const { return status_; }
   bool signed_in() const { return signed_in_; }
-  const base::string16& current_user_name() const { return current_user_name_; }
-  const base::string16& current_user_email() const {
-    return current_user_email_;
+
+  const Users& users() const {
+    return users_;
   }
 
  private:
   scoped_ptr<Apps> apps_;
 
   scoped_ptr<SearchBoxModel> search_box_;
   scoped_ptr<SearchResults> results_;
 
   base::string16 current_user_name_;

[tapted, 2013/09/10 00:29:26]

is this (and current_user_email_) still needed?

[calamity, 2013/09/10 22:50:46]

Removed.

   base::string16 current_user_email_;
   bool signed_in_;
+  Users users_;

[tapted, 2013/09/10 00:29:26]

nit: maybe move above signed_in_ -- it's nice to keep primitive types together
(sometimes) to avoid padding for struct alignment.

[calamity, 2013/09/10 22:50:46]

Done.

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