| 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;
|
|
|