Moves extension_icon_image and image_loader to extensions/browser

chrome/browser/extensions/chrome_extensions_browser_client.h

Index: chrome/browser/extensions/chrome_extensions_browser_client.h
diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.h b/chrome/browser/extensions/chrome_extensions_browser_client.h
index 0c5d160379c772df6e5e0e4794524c50e8c8d428..a4ea7c9a16e4f49d06d6319b841490ed34d1ed50 100644
--- a/chrome/browser/extensions/chrome_extensions_browser_client.h
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_CHROME_EXTENSIONS_BROWSER_CLIENT_H_
 #define CHROME_BROWSER_EXTENSIONS_CHROME_EXTENSIONS_BROWSER_CLIENT_H_
 
+#include <map>
+
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/lazy_instance.h"
@@ -22,6 +24,7 @@ class BrowserContext;
 
 namespace extensions {
 
+class ChromeComponentExtensionResourceManager;
 class ChromeExtensionsAPIClient;
 class ContentSettingsPrefsObserver;
 
@@ -89,6 +92,8 @@ class ChromeExtensionsBrowserClient : public ExtensionsBrowserClient {
       ExtensionFunctionRegistry* registry) const OVERRIDE;
   virtual scoped_ptr<extensions::RuntimeAPIDelegate> CreateRuntimeAPIDelegate(
       content::BrowserContext* context) const OVERRIDE;
+  virtual ComponentExtensionResourceManager*
+  GetComponentExtensionResourceManager() OVERRIDE;
 
  private:
   friend struct base::DefaultLazyInstanceTraits<ChromeExtensionsBrowserClient>;
@@ -101,6 +106,12 @@ class ChromeExtensionsBrowserClient : public ExtensionsBrowserClient {
   scoped_ptr<ChromeExtensionsAPIClient> api_client_;
 #endif
 
+  // A map from a resource path to the resource ID.  Used by
+  // IsComponentExtensionResource.
+  std::map<base::FilePath, int> path_to_resource_id_;

[Yoyo Zhou, 2014/06/19 18:16:06]

This shouldn't be here anymore.

[Jun Mukai, 2014/06/19 18:26:10]

Done.

+
+  scoped_ptr<ChromeComponentExtensionResourceManager> resource_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(ChromeExtensionsBrowserClient);
 };