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

ui/base/models/table_model.cc

 // 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.
 
 #include "ui/base/models/table_model.h"
 
 #include "base/logging.h"
-#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image/image_skia.h"

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

Drive-by nit (prompted by http://codereview.chromium.org/10447053):
This should be alphabetized after ui/base/*

 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_collator.h"
 
 namespace ui {
 
 // TableColumn -----------------------------------------------------------------
 
 TableColumn::TableColumn()
     : id(0),
       title(),
@@ skipping 48 matching lines @@
       min_visible_width(0),
       sortable(false) {
   title = l10n_util::GetStringUTF16(id);
 }
 
 // TableModel -----------------------------------------------------------------
 
 // Used for sorting.
 static icu::Collator* collator = NULL;
 
-SkBitmap TableModel::GetIcon(int row) {
-  return SkBitmap();
+gfx::ImageSkia TableModel::GetIcon(int row) {
+  return gfx::ImageSkia();
 }
 
 string16 TableModel::GetTooltip(int row) {
   return string16();
 }
 
 bool TableModel::ShouldIndent(int row) {
   return false;
 }
 
@@ skipping 40 matching lines @@
     collator = icu::Collator::createInstance(create_status);
     if (!U_SUCCESS(create_status)) {
       collator = NULL;
       NOTREACHED();
     }
   }
   return collator;
 }
 
 }  // namespace ui