Index: chrome/browser/extensions/chrome_extensions_browser_client.cc |
diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc |
index 4a86a9584afd6c06bc02da562e44f0ebec885a34..84961bdbcdf5dd3ec925ed22cd3e6fd7c821ae69 100644 |
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc |
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc |
@@ -40,7 +40,10 @@ |
#include "extensions/browser/url_request_util.h" |
#if defined(OS_CHROMEOS) |
+#include "chrome/browser/extensions/updater/extension_cache_impl.h" |
#include "chromeos/chromeos_switches.h" |
+#else |
+#include "extensions/browser/updater/null_extension_cache.h" |
#endif |
namespace extensions { |
@@ -51,6 +54,12 @@ ChromeExtensionsBrowserClient::ChromeExtensionsBrowserClient() { |
// Only set if it hasn't already been set (e.g. by a test). |
if (GetCurrentChannel() == GetDefaultChannel()) |
SetCurrentChannel(chrome::VersionInfo::GetChannel()); |
+ |
+#if defined(OS_CHROMEOS) |
+ extension_cache_.reset(new ExtensionCacheImpl()); |
+#else |
+ extension_cache_.reset(new NullExtensionCache()); |
+#endif |
} |
ChromeExtensionsBrowserClient::~ChromeExtensionsBrowserClient() {} |
@@ -242,6 +251,13 @@ void ChromeExtensionsBrowserClient::RegisterExtensionFunctions( |
extensions::api::GeneratedFunctionRegistry::RegisterAll(registry); |
} |
+scoped_ptr<extensions::RuntimeAPIDelegate> |
+ChromeExtensionsBrowserClient::CreateRuntimeAPIDelegate( |
+ content::BrowserContext* context) const { |
+ return scoped_ptr<extensions::RuntimeAPIDelegate>( |
+ new ChromeRuntimeAPIDelegate(context)); |
+} |
+ |
ComponentExtensionResourceManager* |
ChromeExtensionsBrowserClient::GetComponentExtensionResourceManager() { |
if (!resource_manager_) |
@@ -260,11 +276,8 @@ net::NetLog* ChromeExtensionsBrowserClient::GetNetLog() { |
return g_browser_process->net_log(); |
} |
-scoped_ptr<extensions::RuntimeAPIDelegate> |
-ChromeExtensionsBrowserClient::CreateRuntimeAPIDelegate( |
- content::BrowserContext* context) const { |
- return scoped_ptr<extensions::RuntimeAPIDelegate>( |
- new ChromeRuntimeAPIDelegate(context)); |
+ExtensionCache* ChromeExtensionsBrowserClient::GetExtensionCache() { |
+ return extension_cache_.get(); |
} |
} // namespace extensions |