Views: Update ImageLoadingTracker::Observer subclasses

chrome/browser/ui/views/infobars/extension_infobar.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/infobars/extension_infobar.h"
 
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_infobar_delegate.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "grit/theme_resources.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/widget/widget.h"
 
 // ExtensionInfoBarDelegate ----------------------------------------------------
 
 InfoBar* ExtensionInfoBarDelegate::CreateInfoBar(InfoBarTabHelper* owner) {
   return new ExtensionInfoBar(browser_, owner, this);
 }
 
@@ skipping 57 matching lines @@
   // the close button is the last child.
   InfoBarView::ViewHierarchyChanged(is_add, parent, child);
 
   // This must happen after adding all children because it can trigger layout,
   // which assumes that particular children (e.g. the close button) have already
   // been added.
   const Extension* extension = extension_host->extension();
   ExtensionIconSet::Icons image_size = ExtensionIconSet::EXTENSION_ICON_BITTY;
   ExtensionResource icon_resource = extension->GetIconResource(
       image_size, ExtensionIconSet::MATCH_EXACTLY);
-  if (!icon_resource.relative_path().empty()) {

[sky, 2012/02/29 15:44:05]

Did you remove this because ImageTracker takes care of it?

-    tracker_.LoadImage(extension, icon_resource,
-        gfx::Size(image_size, image_size), ImageLoadingTracker::DONT_CACHE);
-  } else {
-    OnImageLoaded(NULL, icon_resource, 0);
-  }
+  tracker_.LoadImage(extension, icon_resource,
+      gfx::Size(image_size, image_size), ImageLoadingTracker::DONT_CACHE);
 }
 
 int ExtensionInfoBar::ContentMinimumWidth() const {
   return menu_->GetPreferredSize().width() + kMenuHorizontalMargin;
 }
 
-void ExtensionInfoBar::OnImageLoaded(SkBitmap* image,
-                                     const ExtensionResource& resource,
+void ExtensionInfoBar::OnImageLoaded(const gfx::Image& image,
+                                     const std::string& extension_id,
                                      int index) {
   if (!GetDelegate())
     return;  // The delegate can go away while we asynchronously load images.
 
-  SkBitmap* icon = image;
+  const SkBitmap* icon = NULL;
   // Fall back on the default extension icon on failure.
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  if (!image || image->empty())
+  if (image.IsEmpty())
     icon = rb.GetBitmapNamed(IDR_EXTENSIONS_SECTION);
+  else
+    icon = image.ToSkBitmap();
 
   SkBitmap* drop_image = rb.GetBitmapNamed(IDR_APP_DROPARROW);
 
   int image_size = ExtensionIconSet::EXTENSION_ICON_BITTY;
   // The margin between the extension icon and the drop-down arrow bitmap.
   static const int kDropArrowLeftMargin = 3;
   scoped_ptr<gfx::CanvasSkia> canvas(new gfx::CanvasSkia(
       gfx::Size(image_size + kDropArrowLeftMargin + drop_image->width(),
                 image_size),
       false));
@@ skipping 20 matching lines @@
 
   scoped_refptr<ExtensionContextMenuModel> options_menu_contents =
       new ExtensionContextMenuModel(extension, browser_, NULL);
   DCHECK_EQ(source, menu_);
   RunMenuAt(options_menu_contents.get(), menu_, views::MenuItemView::TOPLEFT);
 }
 
 ExtensionInfoBarDelegate* ExtensionInfoBar::GetDelegate() {
   return delegate_ ? delegate_->AsExtensionInfoBarDelegate() : NULL;
 }