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

ui/base/models/table_model.h

 // Copyright (c) 2011 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_BASE_MODELS_TABLE_MODEL_H_
 #define UI_BASE_MODELS_TABLE_MODEL_H_
 #pragma once
 
 #include <vector>
 
 #include "base/string16.h"
 #include "ui/base/ui_export.h"
 #include "unicode/coll.h"
 
-class SkBitmap;
+namespace gfx {
+class ImageSkia;
+}
 
 namespace ui {
 
 class TableModelObserver;
 
 // The model driving the TableView.
 class UI_EXPORT TableModel {
  public:
   // See HasGroups, get GetGroupID for details as to how this is used.
   struct Group {
     // The title text for the group.
     string16 title;
 
     // Unique id for the group.
     int id;
   };
   typedef std::vector<Group> Groups;
 
   // Number of rows in the model.
   virtual int RowCount() = 0;
 
   // Returns the value at a particular location in text.
   virtual string16 GetText(int row, int column_id) = 0;
 
   // Returns the small icon (16x16) that should be displayed in the first
   // column before the text. This is only used when the TableView was created
-  // with the ICON_AND_TEXT table type. Returns an isNull() bitmap if there is
-  // no bitmap.
-  virtual SkBitmap GetIcon(int row);
+  // with the ICON_AND_TEXT table type. Returns an isNull() image if there is
+  // no image.
+  virtual gfx::ImageSkia GetIcon(int row);
 
   // Returns the tooltip, if any, to show for a particular row.  If there are
   // multiple columns in the row, this will only be shown when hovering over
   // column zero.
   virtual string16 GetTooltip(int row);
 
   // If true, this row should be indented.
   virtual bool ShouldIndent(int row);
 
   // Returns true if the TableView has groups. Groups provide a way to visually
@@ skipping 82 matching lines @@
   // to be visible.
   int min_visible_width;
 
   // Is this column sortable? Default is false
   bool sortable;
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_MODELS_TABLE_MODEL_H_