A non-GTK version of menus for touchui.

chrome/browser/ui/views/wrench_menu.cc

 // Copyright (c) 2010 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 "chrome/browser/views/wrench_menu.h"
 
 #include <cmath>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 665 matching lines @@
     }
   }
 }
 
 MenuItemView* WrenchMenu::AppendMenuItem(MenuItemView* parent,
                                          MenuModel* model,
                                          int index,
                                          MenuModel::ItemType menu_type,
                                          int* next_id) {
   int id = (*next_id)++;
-  SkBitmap icon;
-  std::wstring label;
-  MenuItemView::Type type;
-  switch (menu_type) {
-    case MenuModel::TYPE_COMMAND:
-      model->GetIconAt(index, &icon);
-      type = MenuItemView::NORMAL;
-      label = UTF16ToWide(model->GetLabelAt(index));
-      break;
-    case MenuModel::TYPE_CHECK:
-      type = MenuItemView::CHECKBOX;
-      label = UTF16ToWide(model->GetLabelAt(index));
-      break;
-    case MenuModel::TYPE_RADIO:
-      type = MenuItemView::RADIO;
-      label = UTF16ToWide(model->GetLabelAt(index));
-      break;
-    case MenuModel::TYPE_SEPARATOR:
-      type = MenuItemView::SEPARATOR;
-      break;
-    case MenuModel::TYPE_SUBMENU:
-      type = MenuItemView::SUBMENU;
-      label = UTF16ToWide(model->GetLabelAt(index));
-      break;
-    default:
-      NOTREACHED();
-      type = MenuItemView::NORMAL;
-      break;
-  }
 
   id_to_entry_[id].first = model;
   id_to_entry_[id].second = index;
 
-  MenuItemView* menu_item = parent->AppendMenuItemImpl(id, label, icon, type);
+  MenuItemView* menu_item = parent->AppendMenuItemFromModel(model, index, id);
 
   if (menu_item)
     menu_item->SetVisible(model->IsVisibleAt(index));
 
   if (menu_type == MenuModel::TYPE_COMMAND && model->HasIcons()) {
     SkBitmap icon;
     if (model->GetIconAt(index, &icon))
       menu_item->SetIcon(icon);
   }
 
   return menu_item;
 }
 
 void WrenchMenu::CancelAndEvaluate(MenuModel* model, int index) {
   selected_menu_model_ = model;
   selected_index_ = index;
   root_->Cancel();
 }