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

ui/views/controls/table/table_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/table/table_view_views.h"
 
 #include "base/i18n/rtl.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/table_model.h"
+#include "ui/base/native_theme/native_theme.h"
 #include "ui/gfx/canvas.h"
-#include "ui/base/native_theme/native_theme.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/table/table_view_observer.h"
 
 // Padding around the text (on each side).
 static const int kTextVerticalPadding = 3;
 static const int kTextHorizontalPadding = 2;
 
 // TODO: these should come from native theme or something.
@@ skipping 220 matching lines @@
   max_row = std::min(max_row, RowCount());
   for (int i = min_row; i < max_row; ++i) {
     gfx::Rect row_bounds(GetRowBounds(i));
     if (i == selected_row_) {
       canvas->FillRect(row_bounds, kSelectedBackgroundColor);
       if (HasFocus())
         canvas->DrawFocusRect(row_bounds);
     }
     int text_x = kTextHorizontalPadding;
     if (table_type_ == ICON_AND_TEXT) {
-      SkBitmap image = model_->GetIcon(i);
+      gfx::ImageSkia image = model_->GetIcon(i);
       if (!image.isNull()) {
         int image_x = GetMirroredXWithWidthInView(text_x, image.width());
         canvas->DrawBitmapInt(
             image, 0, 0, image.width(), image.height(),
             image_x, row_bounds.y() + (row_bounds.height() - kImageSize) / 2,
             kImageSize, kImageSize, true);
       }
       text_x += kImageSize + kImageToTextPadding;
     }
     canvas->DrawStringInt(
@@ skipping 18 matching lines @@
 void TableView::NumRowsChanged() {
   PreferredSizeChanged();
   SchedulePaint();
 }
 
 gfx::Rect TableView::GetRowBounds(int row) {
   return gfx::Rect(0, row * row_height_, width(), row_height_);
 }
 
 }  // namespace views