Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(716)

Unified Diff: ui/app_list/app_list_menu.h

Issue 20656002: Add profile selector menu to app list. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove binary changes Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/app_list.gyp ('k') | ui/app_list/app_list_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/app_list_menu.h
diff --git a/ui/app_list/app_list_menu.h b/ui/app_list/app_list_menu.h
index ff4be49e4c59f89d9940ae3ea88ed9f412d76cd9..8ccc39764a6dacb0892324828da92150503d8d81 100644
--- a/ui/app_list/app_list_menu.h
+++ b/ui/app_list/app_list_menu.h
@@ -5,6 +5,7 @@
#ifndef UI_APP_LIST_APP_LIST_MENU_H_
#define UI_APP_LIST_APP_LIST_MENU_H_
+#include "ui/app_list/app_list_model.h"
#include "ui/base/models/simple_menu_model.h"
namespace app_list {
@@ -21,9 +22,14 @@ class AppListMenu : public ui::SimpleMenuModel::Delegate {
SHOW_SETTINGS,
SHOW_HELP,
SHOW_FEEDBACK,
+ // |SELECT_PROFILE| must remain the last enum because values greater than
+ // |SELECT_PROFILE| are used to indicate a profile index.
+ SELECT_PROFILE,
};
- explicit AppListMenu(AppListViewDelegate* delegate);
+ AppListMenu(
+ AppListViewDelegate* delegate,
+ const AppListModel::Users& users);
virtual ~AppListMenu();
ui::SimpleMenuModel* menu_model() { return &menu_model_; }
@@ -40,6 +46,7 @@ class AppListMenu : public ui::SimpleMenuModel::Delegate {
ui::SimpleMenuModel menu_model_;
AppListViewDelegate* delegate_;
+ AppListModel::Users users_;
DISALLOW_COPY_AND_ASSIGN(AppListMenu);
};
« no previous file with comments | « ui/app_list/app_list.gyp ('k') | ui/app_list/app_list_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698