| 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 f89648cd4d3a5f28e11378d5f9c62845d1ac6b48..c85146ac69866ca2b8e5aee11171f95b3c4ca464 100644
|
| --- a/ui/views/controls/menu/menu_item_view.cc
|
| +++ b/ui/views/controls/menu/menu_item_view.cc
|
| @@ -224,7 +224,7 @@ MenuItemView* MenuItemView::AddMenuItemAt(int index,
|
| item->SetTitle(GetDelegate()->GetLabel(item_id));
|
| else
|
| item->SetTitle(label);
|
| - if (!icon.empty())
|
| + if (!icon.isNull())
|
| item->SetIcon(icon);
|
| if (type == SUBMENU)
|
| item->CreateSubmenu();
|
| @@ -366,7 +366,7 @@ void MenuItemView::SetIcon(const gfx::ImageSkia& icon, int item_id) {
|
| }
|
|
|
| void MenuItemView::SetIcon(const gfx::ImageSkia& icon) {
|
| - if (icon.empty()) {
|
| + if (icon.isNull()) {
|
| SetIconView(NULL);
|
| return;
|
| }
|
|
|