Remove ImageSkia::empty and ImageSkia::extractSubset

ui/views/controls/menu/menu_item_view.cc

 // Copyright (c) 2012 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 "ui/views/controls/menu/menu_item_view.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ui_strings.h"
@@ skipping 206 matching lines @@
   DCHECK_GE(submenu_->child_count(), index);
   if (type == SEPARATOR) {
     submenu_->AddChildViewAt(new MenuSeparator(), index);
     return NULL;
   }
   MenuItemView* item = new MenuItemView(this, item_id, type);
   if (label.empty() && GetDelegate())
     item->SetTitle(GetDelegate()->GetLabel(item_id));
   else
     item->SetTitle(label);
-  if (!icon.empty())
+  if (!icon.isNull())
     item->SetIcon(icon);
   if (type == SUBMENU)
     item->CreateSubmenu();
   submenu_->AddChildViewAt(item, index);
   return item;
 }
 
 void MenuItemView::RemoveMenuItemAt(int index) {
   DCHECK(submenu_);
   DCHECK_LE(0, index);
@@ skipping 121 matching lines @@
   item->tooltip_ = tooltip;
 }
 
 void MenuItemView::SetIcon(const gfx::ImageSkia& icon, int item_id) {
   MenuItemView* item = GetMenuItemByID(item_id);
   DCHECK(item);
   item->SetIcon(icon);
 }
 
 void MenuItemView::SetIcon(const gfx::ImageSkia& icon) {
-  if (icon.empty()) {
+  if (icon.isNull()) {
     SetIconView(NULL);
     return;
   }
 
   ImageView* icon_view = new ImageView();
   icon_view->SetImage(&icon);
   SetIconView(icon_view);
 }
 
 void MenuItemView::SetIconView(View* icon_view) {
@@ skipping 466 matching lines @@
       temp_width = menu_item->GetMaxIconViewWidth();
     } else if (menu_item->icon_view()) {
       temp_width = menu_item->icon_view()->GetPreferredSize().width();
     }
     width = std::max(width, temp_width);
   }
   return width;
 }
 
 }  // namespace views