Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Unified Diff: ui/views/controls/menu/menu_item_view.cc

Issue 10824359: Remove ImageSkia::empty and ImageSkia::extractSubset (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/image_view.cc ('k') | ui/views/controls/menu/menu_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « ui/views/controls/image_view.cc ('k') | ui/views/controls/menu/menu_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698