diff options
| author | rhashimoto@chromium.org <rhashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-15 17:31:08 +0000 |
|---|---|---|
| committer | rhashimoto@chromium.org <rhashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-15 17:31:08 +0000 |
| commit | e5d4d45e93fec02246970aa0830551e44504cd07 (patch) | |
| tree | d2ed8656b6e7f86a2870ae7cde612d5972b72d51 /views | |
| parent | e33f01e9059aaa9bf592f2b5db90be44f56df0ac (diff) | |
| download | chromium_src-e5d4d45e93fec02246970aa0830551e44504cd07.zip chromium_src-e5d4d45e93fec02246970aa0830551e44504cd07.tar.gz chromium_src-e5d4d45e93fec02246970aa0830551e44504cd07.tar.bz2 | |
Enable MenuItemView to load icons for MenuModel submenus.
BUG=chromium:89153
TEST=add SpellBook extension, check that context menu entry has icon
Review URL: http://codereview.chromium.org/7375005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92708 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/menu/menu_item_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc index 6c70190..9103652 100644 --- a/views/controls/menu/menu_item_view.cc +++ b/views/controls/menu/menu_item_view.cc @@ -303,13 +303,12 @@ MenuItemView* MenuItemView::AppendMenuItemFromModel(ui::MenuModel* model, int index, int id) { SkBitmap icon; - bool has_icon = false; std::wstring label; MenuItemView::Type type; ui::MenuModel::ItemType menu_type = model->GetTypeAt(index); switch (menu_type) { case ui::MenuModel::TYPE_COMMAND: - has_icon = model->GetIconAt(index, &icon); + model->GetIconAt(index, &icon); type = MenuItemView::NORMAL; label = UTF16ToWide(model->GetLabelAt(index)); break; @@ -325,6 +324,7 @@ MenuItemView* MenuItemView::AppendMenuItemFromModel(ui::MenuModel* model, type = MenuItemView::SEPARATOR; break; case ui::MenuModel::TYPE_SUBMENU: + model->GetIconAt(index, &icon); type = MenuItemView::SUBMENU; label = UTF16ToWide(model->GetLabelAt(index)); break; @@ -334,7 +334,7 @@ MenuItemView* MenuItemView::AppendMenuItemFromModel(ui::MenuModel* model, break; } - return AppendMenuItemImpl(id, label, has_icon ? icon : SkBitmap(), type); + return AppendMenuItemImpl(id, label, icon, type); } MenuItemView* MenuItemView::AppendMenuItemImpl(int item_id, |