[win] Change app launcher profile indicator to be a menu.

ui/views/controls/menu/menu_model_adapter.cc

 // Copyright (c) 2012 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/views/controls/menu/menu_model_adapter.h"
 
 #include "base/logging.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/views/controls/menu/submenu_view.h"
@@ skipping 32 matching lines @@
   BuildMenuImpl(menu, menu_model_);
   menu->ChildrenChanged();
 }
 
 MenuItemView* MenuModelAdapter::CreateMenu() {
   MenuItemView* item = new MenuItemView(this);
   BuildMenu(item);
   return item;
 }
 
+MenuItemView* MenuModelAdapter::CreateCustomItem(MenuItemView* parent, int id) {
+  return NULL;
+}
+
 // MenuModelAdapter, MenuDelegate implementation:
 
 void MenuModelAdapter::ExecuteCommand(int id) {
   ui::MenuModel* model = menu_model_;
   int index = 0;
   if (ui::MenuModel::GetModelAndIndexForCommandId(id, &model, &index)) {
     model->ActivatedAt(index);
     return;
   }
 
@@ skipping 113 matching lines @@
 }
 
 // MenuModelAdapter, private:
 
 void MenuModelAdapter::BuildMenuImpl(MenuItemView* menu, ui::MenuModel* model) {
   DCHECK(menu);
   DCHECK(model);
   bool has_icons = model->HasIcons();
   const int item_count = model->GetItemCount();
   for (int i = 0; i < item_count; ++i) {
-    MenuItemView* item = menu->AppendMenuItemFromModel(
-        model, i, model->GetCommandIdAt(i));
+    MenuItemView* item = CreateCustomItem(menu, model->GetCommandIdAt(i));

[sky, 2013/03/20 14:35:09]

Can we rename this CreateMenuItem and have it do the creation? If a subclass
wants other logic it need only override it.

[benwells, 2013/03/20 23:08:30]

Good idea, renamed to AppendMenuItem, which simplifies things nicely.

+    if (item) {
+      menu->CreateSubmenu();
+      menu->GetSubmenu()->AddChildViewAt(item, i);
+    } else {
+      item = menu->AppendMenuItemFromModel(model, i, model->GetCommandIdAt(i));
+    }
 
     if (item)
       item->SetVisible(model->IsVisibleAt(i));
 
     if (model->GetTypeAt(i) == ui::MenuModel::TYPE_SUBMENU) {
       DCHECK(item);
       DCHECK_EQ(MenuItemView::SUBMENU, item->GetType());
       ui::MenuModel* submodel = model->GetSubmenuModelAt(i);
       DCHECK(submodel);
       BuildMenuImpl(item, submodel);
       has_icons = has_icons || item->has_icons();
 
       menu_map_[item] = submodel;
     }
   }
 
   menu->set_has_icons(has_icons);
 }
 
 }  // namespace views