Revert 132196 - Attempt to load component extension favicon from the resources first.

chrome/browser/ui/webui/extensions/extension_icon_source.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_ICON_SOURCE_H_
 #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_ICON_SOURCE_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 60 matching lines @@
   virtual std::string GetMimeType(const std::string&) const OVERRIDE;
 
   virtual void StartDataRequest(const std::string& path,
                                 bool is_incognito,
                                 int request_id) OVERRIDE;
 
  private:
   // Encapsulates the request parameters for |request_id|.
   struct ExtensionIconRequest;
 
+  // Returns the bitmap for the webstore icon.
+  const SkBitmap* GetWebStoreImage();
+
   // Returns the bitmap for the default app image.
   const SkBitmap* GetDefaultAppImage();
 
   // Returns the bitmap for the default extension.
   const SkBitmap* GetDefaultExtensionImage();
 
   // Performs any remaining transformations (like desaturating the |image|),
   // then returns the |image| to the client and clears up any temporary data
   // associated with the |request_id|.
   void FinalizeImage(const SkBitmap* image, int request_id);
 
   // Loads the default image for |request_id| and returns to the client.
   void LoadDefaultImage(int request_id);
 
+  // Tries loading component extension image. These usually come from resources
+  // instead of file system. Returns false if a given |icon| does not have
+  // a corresponding image in bundled resources.
+  bool TryLoadingComponentExtensionImage(const ExtensionResource& icon,
+                                         int request_id);
+
   // Loads the extension's |icon| for the given |request_id| and returns the
   // image to the client.
   void LoadExtensionImage(const ExtensionResource& icon, int request_id);
 
   // Loads the favicon image for the app associated with the |request_id|. If
   // the image does not exist, we fall back to the default image.
   void LoadFaviconImage(int request_id);
 
   // FaviconService callback
   void OnFaviconDataAvailable(FaviconService::Handle request_handle,
@@ skipping 50 matching lines @@
   scoped_ptr<SkBitmap> default_app_data_;
 
   scoped_ptr<SkBitmap> default_extension_data_;
 
   CancelableRequestConsumerT<int, 0> cancelable_consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionIconSource);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_ICON_SOURCE_H_