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

chrome/browser/ui/search_engines/template_url_table_model.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 "chrome/browser/ui/search_engines/template_url_table_model.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/table_model_observer.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/image/image_skia.h"
 
 // Group IDs used by TemplateURLTableModel.
 static const int kMainGroupID = 0;
 static const int kOtherGroupID = 1;
 
 // ModelEntry ----------------------------------------------------
 
 // ModelEntry wraps a TemplateURL as returned from the TemplateURL.
 // ModelEntry also tracks state information about the URL.
 
 // Icon used while loading, or if a specific favicon can't be found.
 static SkBitmap* default_icon = NULL;
 
 class ModelEntry {
  public:
   ModelEntry(TemplateURLTableModel* model, TemplateURL* template_url)
       : template_url_(template_url),
         load_state_(NOT_LOADED),
         model_(model) {
     if (!default_icon) {
       default_icon = ResourceBundle::GetSharedInstance().
           GetBitmapNamed(IDR_DEFAULT_FAVICON);
     }
   }
 
   TemplateURL* template_url() {
     return template_url_;
   }
 
-  SkBitmap GetIcon() {
+  gfx::ImageSkia GetIcon() {
     if (load_state_ == NOT_LOADED)
       LoadFavicon();
     if (!favicon_.isNull())
       return favicon_;
     return *default_icon;
   }
 
   // Resets internal status so that the next time the icon is asked for its
   // fetched again. This should be invoked if the url is modified.
   void ResetIcon() {
@@ skipping 123 matching lines @@
     return (template_url_service_->GetDefaultSearchProvider() == url) ?
         l10n_util::GetStringFUTF16(IDS_SEARCH_ENGINES_EDITOR_DEFAULT_ENGINE,
                                    url_short_name) : url_short_name;
   }
 
   DCHECK_EQ(IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN, col_id);
   // Keyword should be domain name. Force it to have LTR directionality.
   return base::i18n::GetDisplayStringInLTRDirectionality(url->keyword());
 }
 
-SkBitmap TemplateURLTableModel::GetIcon(int row) {
+gfx::ImageSkia TemplateURLTableModel::GetIcon(int row) {
   DCHECK(row >= 0 && row < RowCount());
   return entries_[row]->GetIcon();
 }
 
 void TemplateURLTableModel::SetObserver(ui::TableModelObserver* observer) {
   observer_ = observer;
 }
 
 bool TemplateURLTableModel::HasGroups() {
   return true;
@@ skipping 158 matching lines @@
 void TemplateURLTableModel::FaviconAvailable(ModelEntry* entry) {
   std::vector<ModelEntry*>::iterator i =
       std::find(entries_.begin(), entries_.end(), entry);
   DCHECK(i != entries_.end());
   NotifyChanged(static_cast<int>(i - entries_.begin()));
 }
 
 void TemplateURLTableModel::OnTemplateURLServiceChanged() {
   Reload();
 }