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

ui/views/controls/table/table_view_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/table/table_view_win.h"
 
 #include <commctrl.h>
 #include <windowsx.h>
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/win/scoped_gdi_object.h"
 #include "skia/ext/skia_utils_win.h"
-#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image/image_skia.h"

[msw, 2012/05/29 07:50:51]

nit: remove this include; it's duplicated below in correct alphabetical order.

 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/models/table_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/icon_util.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/controls/table/table_view_observer.h"
 
 namespace {
 
 int GetViewIndexFromPoint(HWND window, const gfx::Point& p) {
   LVHITTESTINFO hit_info = {0};
   hit_info.pt.x = p.x();
   hit_info.pt.y = p.y();
   return ListView_HitTest(window, &hit_info);
@@ skipping 1181 matching lines @@
     case CDDS_ITEMPOSTPAINT: {
       DCHECK((table_type_ == ICON_AND_TEXT) || (ImplementPostPaint()));
       int view_index = static_cast<int>(draw_info->nmcd.dwItemSpec);
       // We get notifications for empty items, just ignore them.
       if (view_index >= model_->RowCount())
         return CDRF_DODEFAULT;
       int model_index = ViewToModel(view_index);
       LRESULT r = CDRF_DODEFAULT;
       // First let's take care of painting the right icon.
       if (table_type_ == ICON_AND_TEXT) {
-        SkBitmap image = model_->GetIcon(model_index);
+        gfx::ImageSkia image = model_->GetIcon(model_index);
         if (!image.isNull()) {
           // Get the rect that holds the icon.
           RECT icon_rect, client_rect;
           if (ListView_GetItemRect(list_view_, view_index, &icon_rect,
                                    LVIR_ICON) &&
               GetClientRect(list_view_, &client_rect)) {
             RECT intersection;
             // Client rect includes the header but we need to make sure we don't
             // paint into it.
             client_rect.top += content_offset_;
@@ skipping 400 matching lines @@
 }
 
 void TableSelectionIterator::UpdateModelIndexFromViewIndex() {
   if (view_index_ == -1)
     model_index_ = -1;
   else
     model_index_ = table_view_->ViewToModel(view_index_);
 }
 
 }  // namespace views