Views: Update ImageLoadingTracker::Observer subclasses

chrome/browser/ui/views/create_application_shortcut_view.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/views/create_application_shortcut_view.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 39 matching lines @@
 class AppInfoView : public views::View {
  public:
   AppInfoView(const string16& title,
               const string16& description,
               const SkBitmap& icon);
 
   // Updates the title/description of the web app.
   void UpdateText(const string16& title, const string16& description);
 
   // Updates the icon of the web app.
-  void UpdateIcon(const SkBitmap& new_icon);
+  void UpdateIcon(const gfx::Image& image);
 
   // Overridden from views::View:
   virtual void OnPaint(gfx::Canvas* canvas);
 
  private:
   // Initializes the controls
   void Init(const string16& title,
             const string16& description, const SkBitmap& icon);
 
   // Creates or updates description label.
@@ skipping 81 matching lines @@
 }
 
 void AppInfoView::UpdateText(const string16& title,
                              const string16& description) {
   title_->SetText(title);
   PrepareDescriptionLabel(description);
 
   SetupLayout();
 }
 
-void AppInfoView::UpdateIcon(const SkBitmap& new_icon) {
-  icon_->SetImage(new_icon);
+void AppInfoView::UpdateIcon(const gfx::Image& image) {
+  icon_->SetImage(image.ToSkBitmap());
 }
 
 void AppInfoView::OnPaint(gfx::Canvas* canvas) {
   gfx::Rect bounds = GetLocalBounds();
 
   SkRect border_rect = {
     SkIntToScalar(bounds.x()),
     SkIntToScalar(bounds.y()),
     SkIntToScalar(bounds.right()),
     SkIntToScalar(bounds.bottom())
@@ skipping 288 matching lines @@
                  base::Unretained(pending_download_)));
 
   unprocessed_icons_.pop_back();
 }
 
 void CreateUrlApplicationShortcutView::OnIconDownloaded(bool errored,
                                                         const SkBitmap& image) {
   pending_download_ = NULL;
 
   if (!errored && !image.isNull()) {
-    shortcut_info_.favicon = image;
+    shortcut_info_.favicon = gfx::Image(image);
     static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon);
   } else {
     FetchIcon();
   }
 }
 
 CreateChromeApplicationShortcutView::CreateChromeApplicationShortcutView(
     Profile* profile,
     const Extension* app) :
       CreateApplicationShortcutView(profile),
@@ skipping 32 matching lines @@
   tracker_.LoadImage(app_,
                      icon_resource,
                      max_size,
                      ImageLoadingTracker::DONT_CACHE);
 }
 
 CreateChromeApplicationShortcutView::~CreateChromeApplicationShortcutView() {}
 
 // Called by tracker_ when the app's icon is loaded.
 void CreateChromeApplicationShortcutView::OnImageLoaded(
-    SkBitmap* image, const ExtensionResource& resource, int index) {
-  if (!image || image->isNull())
-    image = ExtensionIconSource::LoadImageByResourceId(IDR_APP_DEFAULT_ICON);
+    const gfx::Image& image,
+    const std::string& extension_id,
+    int index) {
+  if (image.IsEmpty()) {
+    shortcut_info_.favicon = ui::ResourceBundle::GetSharedInstance().
+        GetImageNamed(IDR_APP_DEFAULT_ICON);
+  } else {
+    shortcut_info_.favicon = image;
+  }
 
-  shortcut_info_.favicon = *image;
   CHECK(app_info_);
   static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon);
 }