Add support for multiple icon sizes for Mac platform apps

chrome/browser/ui/webui/ntp/favicon_webui_handler.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/webui/ntp/favicon_webui_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
@@ skipping 32 matching lines @@
 
 // Thin inheritance-dependent trampoline to forward notification of app
 // icon loads to the FaviconWebUIHandler. Base class does caching of icons.
 class ExtensionIconColorManager : public ExtensionIconManager {
  public:
   explicit ExtensionIconColorManager(FaviconWebUIHandler* handler)
       : ExtensionIconManager(),
         handler_(handler) {}
   virtual ~ExtensionIconColorManager() {}
 
-  virtual void OnImageLoaded(SkBitmap* image,
-                             const ExtensionResource& resource,
+  virtual void OnImageLoaded(const gfx::Image& image,
+                             const std::string& extension_id,
                              int index) OVERRIDE {
-    ExtensionIconManager::OnImageLoaded(image, resource, index);
-    handler_->NotifyAppIconReady(resource.extension_id());
+    ExtensionIconManager::OnImageLoaded(image, extension_id, index);
+    handler_->NotifyAppIconReady(extension_id);
   }
 
  private:
   FaviconWebUIHandler* handler_;
 };
 
 FaviconWebUIHandler::FaviconWebUIHandler()
     : id_(0),
       app_icon_color_manager_(new ExtensionIconColorManager(this)) {
 }
@@ skipping 87 matching lines @@
   std::vector<unsigned char> bits;
   if (!gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, true, &bits))
     return;
   scoped_refptr<RefCountedStaticMemory> bits_mem(
       new RefCountedStaticMemory(&bits.front(), bits.size()));
   scoped_ptr<StringValue> color_value(GetDominantColorCssString(bits_mem));
   StringValue id(extension_id);
   web_ui()->CallJavascriptFunction(
       "ntp.setStripeColor", id, *color_value);
 }