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

ui/views/examples/table_example.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/examples/table_example.h"
 
 #include <vector>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/layout/grid_layout.h"
 
 namespace views {
 namespace examples {
 
 TableExample::TableExample() : ExampleBase("Table") , table_(NULL) {
 }
 
 TableExample::~TableExample() {
@@ skipping 82 matching lines @@
   const char* const cells[5][4] = {
     { "Orange", "Orange", "South america", "$5" },
     { "Apple", "Green", "Canada", "$3" },
     { "Blue berries", "Blue", "Mexico", "$10.3" },
     { "Strawberries", "Red", "California", "$7" },
     { "Cantaloupe", "Orange", "South america", "$5" },
   };
   return ASCIIToUTF16(cells[row % 5][column_id]);
 }
 
-SkBitmap TableExample::GetIcon(int row) {
+gfx::ImageSkia TableExample::GetIcon(int row) {
   return row % 2 ? icon1_ : icon2_;
 }
 
 void TableExample::SetObserver(ui::TableModelObserver* observer) {}
 
 void TableExample::OnSelectionChanged() {
   PrintStatus("Selected: %s",
               UTF16ToASCII(GetText(table_->FirstSelectedRow(), 0)).c_str());
 }
 
@@ skipping 26 matching lines @@
   } else if (sender == column4_visible_checkbox_) {
     index = 3;
     show = column4_visible_checkbox_->checked();
   }
   table_->SetColumnVisibility(index, show);
 #endif
 }
 
 }  // namespace examples
 }  // namespace views