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

Unified Diff: ui/app_list/views/app_list_menu_views.cc

Issue 20656002: Add profile selector menu to app list. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 5 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
Index: ui/app_list/views/app_list_menu_views.cc
diff --git a/ui/app_list/views/app_list_menu_views.cc b/ui/app_list/views/app_list_menu_views.cc
index 0eb853607f01c9c0aaad8f34a0b4f88f779d0415..48d784f0491a120560f6a1f60b8e508eefed5fca 100644
--- a/ui/app_list/views/app_list_menu_views.cc
+++ b/ui/app_list/views/app_list_menu_views.cc
@@ -76,8 +76,9 @@ class CurrentUserMenuItem : public MenuItemView {
int id,
const base::string16& user_name,
const base::string16& user_email,
- const gfx::ImageSkia& icon)
- : MenuItemView(parent, id, MenuItemView::NORMAL) {
+ const gfx::ImageSkia& icon,
+ MenuItemView::Type type)
+ : MenuItemView(parent, id, type) {
AddChildView(new CurrentUserView(user_name, user_email, icon));
}
@@ -110,7 +111,9 @@ class AppListMenuModelAdapter : public views::MenuModelAdapter {
id,
delegate_->GetCurrentUserName(),
delegate_->GetCurrentUserEmail(),
- *rb.GetImageSkiaNamed(IDR_APP_LIST_USER_INDICATOR));
+ *rb.GetImageSkiaNamed(IDR_APP_LIST_USER_INDICATOR),
+ model->GetTypeAt(index) == ui::MenuModel::TYPE_SUBMENU
+ ? MenuItemView::SUBMENU : MenuItemView::NORMAL);
menu->CreateSubmenu();
menu->GetSubmenu()->AddChildViewAt(item, index);
return item;

Powered by Google App Engine
This is Rietveld 408576698