Index: ui/app_list/app_list_model.h |
diff --git a/ui/app_list/app_list_model.h b/ui/app_list/app_list_model.h |
index fbc7970daa864a8807deefaa6cd8be5130bc05f9..9b3235f1d3d22f3ab2254f8e284a0a622ab49b30 100644 |
--- a/ui/app_list/app_list_model.h |
+++ b/ui/app_list/app_list_model.h |
@@ -5,13 +5,9 @@ |
#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/app_list/app_list_item_list.h" |
#include "ui/base/models/list_model.h" |
@@ -30,31 +26,12 @@ class SearchResult; |
// the model for SearchBoxView. SearchResults owns a list of SearchResult. |
class APP_LIST_EXPORT AppListModel { |
public: |
- // A user of the app list. |
- struct APP_LIST_EXPORT User { |
- User(); |
- ~User(); |
- |
- // Whether or not this user is the current user of the app list. |
- bool active; |
- |
- // The name of this user. |
- base::string16 name; |
- |
- // The email address of this user. |
- base::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<SearchResult> SearchResults; |
- typedef std::vector<User> Users; |
AppListModel(); |
~AppListModel(); |
@@ -63,7 +40,6 @@ class APP_LIST_EXPORT AppListModel { |
void RemoveObserver(AppListModelObserver* observer); |
void SetStatus(Status status); |
- void SetUsers(const Users& profile_menu_items); |
void SetSignedIn(bool signed_in); |
AppListItemList* item_list() { return item_list_.get(); } |
@@ -72,17 +48,11 @@ class APP_LIST_EXPORT AppListModel { |
Status status() const { return status_; } |
bool signed_in() const { return signed_in_; } |
- const Users& users() const { |
- return users_; |
- } |
- |
private: |
scoped_ptr<AppListItemList> item_list_; |
scoped_ptr<SearchBoxModel> search_box_; |
scoped_ptr<SearchResults> results_; |
- Users users_; |
- |
bool signed_in_; |
Status status_; |
ObserverList<AppListModelObserver> observers_; |