summaryrefslogtreecommitdiffstats
path: root/ash/shell
diff options
context:
space:
mode:
authorcalamity@chromium.org <calamity@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-20 08:34:28 +0000
committercalamity@chromium.org <calamity@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-20 08:34:28 +0000
commit97477d640c703b7e40de168e516b5750f6089dc1 (patch)
treeb83464d92f1477a99b138a280e5b507ae892f8e8 /ash/shell
parent21ee994b3bd9c7da7989ae7ada66a24fba3f84fc (diff)
downloadchromium_src-97477d640c703b7e40de168e516b5750f6089dc1.zip
chromium_src-97477d640c703b7e40de168e516b5750f6089dc1.tar.gz
chromium_src-97477d640c703b7e40de168e516b5750f6089dc1.tar.bz2
Add profile selector menu to app list.
Adding a profile selector in the app list menu because currently the only way to switch the profile is to go into the app list settings which is hard to find. This CL covers both the mac and windows app list. The app list switches the profile in place without respawning the app list. * Added AppListModel::User struct to represent a User in the app list. * Added a vector of Users to AppListModel. * AppListMenu builds it model with respect to AppListModel::Users. * The AppListViewDelegate profile is now switchable via SetProfilePath(). Calling this rebuilds the AppListModel which notifies the view to update. * Removed custom menu items and views from app_list_menu_views.cc and deleted current_user_menu_item_view on mac. * Changed ui assets that indicate the current user of the app list. * Tweaked PaginationModel to handle an app list with 0 apps. * Mac app list now sets a new delegate to switch the app list profile rather than dismissing and reshowing. BUG=254143,258729,289872,290048 Review URL: https://chromiumcodereview.appspot.com/20656002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224330 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
-rw-r--r--ash/shell/app_list.cc11
1 files changed, 10 insertions, 1 deletions
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc
index d1a244e..f0dae34 100644
--- a/ash/shell/app_list.cc
+++ b/ash/shell/app_list.cc
@@ -222,7 +222,11 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate {
}
// Overridden from ash::AppListViewDelegate:
- virtual void SetModel(app_list::AppListModel* model) OVERRIDE {
+ virtual void SetProfileByPath(const base::FilePath& profile_path) OVERRIDE {
+ // Nothing needs to be done.
+ }
+
+ virtual void InitModel(app_list::AppListModel* model) OVERRIDE {
model_ = model;
PopulateApps(model_->apps());
DecorateSearchBox(model_->search_box());
@@ -309,6 +313,11 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate {
// Nothing needs to be done.
}
+ virtual void ShowForProfileByPath(
+ const base::FilePath& profile_path) OVERRIDE {
+ // Nothing needs to be done.
+ }
+
app_list::AppListModel* model_;
DISALLOW_COPY_AND_ASSIGN(ExampleAppListViewDelegate);