Add profile selector menu to app list.

ui/app_list/views/app_list_menu_views.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/app_list/views/app_list_menu_views.h"
 
 #include "grit/ui_resources.h"
+#include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/layout/grid_layout.h"
 
@@ skipping 51 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(CurrentUserView);
 };
 
 class CurrentUserMenuItem : public MenuItemView {
  public:
   CurrentUserMenuItem(MenuItemView* parent,
                       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));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CurrentUserMenuItem);
 };
 
 class AppListMenuModelAdapter : public views::MenuModelAdapter {
  public:
   AppListMenuModelAdapter(ui::MenuModel* menu_model,
-                          AppListViewDelegate* delegate)
+                          AppListViewDelegate* delegate,
+                          AppListModel* app_list_model)
       : views::MenuModelAdapter(menu_model),
-        delegate_(delegate) {}
+        delegate_(delegate),
+        app_list_model_(app_list_model) {}
   virtual ~AppListMenuModelAdapter() {}
 
   // Overridden from views::MenuModelAdapter:
   virtual MenuItemView* AppendMenuItem(MenuItemView* menu,
                                        ui::MenuModel* model,
                                        int index) OVERRIDE {
     if (!delegate_)
       return NULL;
 
     int id = model->GetCommandIdAt(index);
     if (id != AppListMenu::CURRENT_USER)
       return MenuModelAdapter::AppendMenuItem(menu, model, index);
 
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     MenuItemView* item = new CurrentUserMenuItem(
         menu,
         id,
-        delegate_->GetCurrentUserName(),
-        delegate_->GetCurrentUserEmail(),
-        *rb.GetImageSkiaNamed(IDR_APP_LIST_USER_INDICATOR));
+        app_list_model_->current_user_name(),
+        app_list_model_->current_user_email(),
+        *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;
   }
 
  private:
   AppListViewDelegate* delegate_;
+  AppListModel* app_list_model_;

[tapted, 2013/07/31 05:43:53]

nit: This should have a comment that it is a weak reference, and who the owner
is.

[calamity, 2013/08/01 08:35:45]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(AppListMenuModelAdapter);
 };
 
 }  // namespace
 
-AppListMenuViews::AppListMenuViews(AppListViewDelegate* delegate)
-    : AppListMenu(delegate) {
-  menu_delegate_.reset(new AppListMenuModelAdapter(menu_model(), delegate));
+AppListMenuViews::AppListMenuViews(AppListViewDelegate* delegate,
+                                   AppListModel* app_list_model)
+    : AppListMenu(delegate, app_list_model->avatar_menu_items()) {
+  menu_delegate_.reset(new AppListMenuModelAdapter(menu_model(),
+                                                   delegate,
+                                                   app_list_model));
   menu_ = new MenuItemView(menu_delegate_.get());
   menu_runner_.reset(new views::MenuRunner(menu_));
   menu_delegate_->BuildMenu(menu_);
 }
 
 AppListMenuViews::~AppListMenuViews() {}
 
 void AppListMenuViews::RunMenuAt(views::MenuButton* button,
                                  const gfx::Point& point) {
   ignore_result(menu_runner_->RunMenuAt(button->GetWidget(), button,
                                         gfx::Rect(point, gfx::Size()),
                                         MenuItemView::TOPRIGHT,
                                         ui::MENU_SOURCE_NONE, 0));
 }
 
 void AppListMenuViews::Cancel() {
   menu_runner_->Cancel();
 }
 
 }  // namespace app_list