Remove ImageSkia::empty and ImageSkia::extractSubset

ui/views/controls/button/text_button.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 305 matching lines @@
 
   void set_icon_text_spacing(int icon_text_spacing) {
     icon_text_spacing_ = icon_text_spacing;
   }
 
   // Sets the icon.
   virtual void SetIcon(const gfx::ImageSkia& icon);
   virtual void SetHoverIcon(const gfx::ImageSkia& icon);
   virtual void SetPushedIcon(const gfx::ImageSkia& icon);
 
-  bool HasIcon() const { return !icon_.empty(); }
+  bool HasIcon() const { return !icon_.isNull(); }
 
   // Meanings are reversed for right-to-left layouts.
   enum IconPlacement {
     ICON_ON_LEFT,
     ICON_ON_RIGHT
   };
 
   IconPlacement icon_placement() { return icon_placement_; }
   void set_icon_placement(IconPlacement icon_placement) {
     icon_placement_ = icon_placement;
@@ skipping 76 matching lines @@
   // Overridden from TextButton:
   virtual void GetExtraParams(
       ui::NativeTheme::ExtraParams* params) const OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(NativeTextButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_