Converts ui/views/controls, ui/views/examples, ui/base/models to ImageSkia

ui/views/controls/menu/menu_item_view_views.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/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 27 matching lines @@
   // selected.
   if (render_selection) {
     SkColor bg_color = ui::NativeTheme::instance()->GetSystemColor(
         ui::NativeTheme::kColorId_FocusedMenuItemBackgroundColor);
     canvas->DrawColor(bg_color, SkXfermode::kSrc_Mode);
   }
 
   // Render the check.
   if (type_ == CHECKBOX && GetDelegate()->IsItemChecked(GetCommand())) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    const SkBitmap* check = rb.GetImageNamed(IDR_MENU_CHECK).ToSkBitmap();
+    const gfx::ImageSkia* check = rb.GetImageNamed(
+        IDR_MENU_CHECK).ToImageSkia();
     // Don't use config.check_width here as it's padded to force more padding.
     gfx::Rect check_bounds(icon_x, icon_y, check->width(), icon_height);
     AdjustBoundsForRTLUI(&check_bounds);
     canvas->DrawBitmapInt(*check, check_bounds.x(), check_bounds.y());
   } else if (type_ == RADIO) {
-    const SkBitmap* image =
+    const gfx::ImageSkia* image =
         GetRadioButtonImage(GetDelegate()->IsItemChecked(GetCommand()));
     gfx::Rect radio_bounds(icon_x,
                            top_margin +
                            (height() - top_margin - bottom_margin -
                             image->height()) / 2,
                            image->width(),
                            image->height());
     AdjustBoundsForRTLUI(&radio_bounds);
     canvas->DrawBitmapInt(*image, radio_bounds.x(), radio_bounds.y());
   }
@@ skipping 43 matching lines @@
                            top_margin + (available_height -
                                          config.arrow_width) / 2,
                            config.arrow_width, height());
     AdjustBoundsForRTLUI(&arrow_bounds);
     canvas->DrawBitmapInt(*GetSubmenuArrowImage(),
                           arrow_bounds.x(), arrow_bounds.y());
   }
 }
 
 }  // namespace views