Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1709)

Unified Diff: chrome/browser/extensions/chrome_extensions_browser_client.cc

Issue 612423003: Move ExtensionCache to //extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test setup Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
« no previous file with comments | « chrome/browser/extensions/chrome_extensions_browser_client.h ('k') | chrome/browser/extensions/extension_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698