Remove ImageSkia::empty and ImageSkia::extractSubset

ui/views/controls/menu/menu_win.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_win.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 383 matching lines @@
 }
 
 void MenuWin::AddMenuItemInternal(int index,
                                   int item_id,
                                   const string16& label,
                                   const gfx::ImageSkia& icon,
                                   HMENU submenu,
                                   MenuItemType type) {
   DCHECK(type != SEPARATOR) << "Call AddSeparator instead!";
 
-  if (!owner_draw_ && !icon.empty())
+  if (!owner_draw_ && !icon.isNull())
     owner_draw_ = true;
 
   if (label.empty() && !delegate()) {
     // No label and no delegate; don't add an empty menu.
     // It appears under some circumstance we're getting an empty label
     // (l10n_util::GetStringUTF16(IDS_TASK_MANAGER) returns ""). This shouldn't
     // happen, but I'm working over the crash here.
     NOTREACHED();
     return;
   }
@@ skipping 150 matching lines @@
       break;
 
     default:
       NOTREACHED();
       return 0;
   }
   return align_flags;
 }
 
 }  // namespace views