| Index: ui/views/controls/menu/menu_item_view.cc
|
| diff --git a/ui/views/controls/menu/menu_item_view.cc b/ui/views/controls/menu/menu_item_view.cc
|
| index 040cd898616e2c8993299abe6b005721ad1391e7..1e526f1647482bbbcbf359b3d9eb87c2db7708bf 100644
|
| --- a/ui/views/controls/menu/menu_item_view.cc
|
| +++ b/ui/views/controls/menu/menu_item_view.cc
|
| @@ -311,60 +311,6 @@ MenuItemView* MenuItemView::AppendMenuItemWithIcon(int item_id,
|
| NORMAL, ui::NORMAL_SEPARATOR);
|
| }
|
|
|
| -MenuItemView* MenuItemView::AppendMenuItemFromModel(ui::MenuModel* model,
|
| - int index,
|
| - int id) {
|
| - gfx::Image icon;
|
| - model->GetIconAt(index, &icon);
|
| - string16 label, sublabel, minor_text;
|
| - ui::MenuSeparatorType separator_style = ui::NORMAL_SEPARATOR;
|
| - MenuItemView::Type type;
|
| - ui::MenuModel::ItemType menu_type = model->GetTypeAt(index);
|
| - switch (menu_type) {
|
| - case ui::MenuModel::TYPE_COMMAND:
|
| - type = MenuItemView::NORMAL;
|
| - label = model->GetLabelAt(index);
|
| - sublabel = model->GetSublabelAt(index);
|
| - minor_text = model->GetMinorTextAt(index);
|
| - break;
|
| - case ui::MenuModel::TYPE_CHECK:
|
| - type = MenuItemView::CHECKBOX;
|
| - label = model->GetLabelAt(index);
|
| - sublabel = model->GetSublabelAt(index);
|
| - minor_text = model->GetMinorTextAt(index);
|
| - break;
|
| - case ui::MenuModel::TYPE_RADIO:
|
| - type = MenuItemView::RADIO;
|
| - label = model->GetLabelAt(index);
|
| - sublabel = model->GetSublabelAt(index);
|
| - minor_text = model->GetMinorTextAt(index);
|
| - break;
|
| - case ui::MenuModel::TYPE_SEPARATOR:
|
| - icon = gfx::Image();
|
| - type = MenuItemView::SEPARATOR;
|
| - separator_style = model->GetSeparatorTypeAt(index);
|
| - break;
|
| - case ui::MenuModel::TYPE_SUBMENU:
|
| - type = MenuItemView::SUBMENU;
|
| - label = model->GetLabelAt(index);
|
| - sublabel = model->GetSublabelAt(index);
|
| - minor_text = model->GetMinorTextAt(index);
|
| - break;
|
| - default:
|
| - NOTREACHED();
|
| - type = MenuItemView::NORMAL;
|
| - break;
|
| - }
|
| -
|
| - return AppendMenuItemImpl(id,
|
| - label,
|
| - sublabel,
|
| - minor_text,
|
| - icon.IsEmpty() ? gfx::ImageSkia() : *icon.ToImageSkia(),
|
| - type,
|
| - separator_style);
|
| -}
|
| -
|
| MenuItemView* MenuItemView::AppendMenuItemImpl(
|
| int item_id,
|
| const string16& label,
|
|
|