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

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

Issue 63933003: Moved ExtensionInfoMap and ExtensionsQuotaService to extensions/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comment fix Created 7 years, 1 month 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/extension_protocols.cc
diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc
index c638672e9d463785fafb056a3019fa46e9d58f2c..13824e4db37806fc4ee230748ccb084d2ad057ef 100644
--- a/chrome/browser/extensions/extension_protocols.cc
+++ b/chrome/browser/extensions/extension_protocols.cc
@@ -23,7 +23,6 @@
#include "base/threading/sequenced_worker_pool.h"
#include "base/threading/thread_restrictions.h"
#include "build/build_config.h"
-#include "chrome/browser/extensions/extension_info_map.h"
#include "chrome/browser/extensions/extension_renderer_state.h"
#include "chrome/browser/extensions/image_loader.h"
#include "chrome/common/chrome_paths.h"
@@ -37,6 +36,7 @@
#include "chrome/common/url_constants.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/resource_request_info.h"
+#include "extensions/browser/info_map.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension_resource.h"
#include "extensions/common/file_util.h"
@@ -314,7 +314,7 @@ class URLRequestExtensionJob : public net::URLRequestFileJob {
bool ExtensionCanLoadInIncognito(const ResourceRequestInfo* info,
const std::string& extension_id,
- ExtensionInfoMap* extension_info_map) {
+ extensions::InfoMap* extension_info_map) {
if (!extension_info_map->IsIncognitoEnabled(extension_id))
return false;
@@ -336,7 +336,7 @@ bool ExtensionCanLoadInIncognito(const ResourceRequestInfo* info,
bool AllowExtensionResourceLoad(net::URLRequest* request,
bool is_incognito,
const Extension* extension,
- ExtensionInfoMap* extension_info_map) {
+ extensions::InfoMap* extension_info_map) {
const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
// We have seen crashes where info is NULL: crbug.com/52374.
@@ -452,9 +452,8 @@ class ExtensionProtocolHandler
: public net::URLRequestJobFactory::ProtocolHandler {
public:
ExtensionProtocolHandler(bool is_incognito,
- ExtensionInfoMap* extension_info_map)
- : is_incognito_(is_incognito),
- extension_info_map_(extension_info_map) {}
+ extensions::InfoMap* extension_info_map)
+ : is_incognito_(is_incognito), extension_info_map_(extension_info_map) {}
virtual ~ExtensionProtocolHandler() {}
@@ -464,7 +463,7 @@ class ExtensionProtocolHandler
private:
const bool is_incognito_;
- ExtensionInfoMap* const extension_info_map_;
+ extensions::InfoMap* const extension_info_map_;
DISALLOW_COPY_AND_ASSIGN(ExtensionProtocolHandler);
};
@@ -599,6 +598,6 @@ ExtensionProtocolHandler::MaybeCreateJob(
net::URLRequestJobFactory::ProtocolHandler* CreateExtensionProtocolHandler(
bool is_incognito,
- ExtensionInfoMap* extension_info_map) {
+ extensions::InfoMap* extension_info_map) {
return new ExtensionProtocolHandler(is_incognito, extension_info_map);
}
« no previous file with comments | « chrome/browser/extensions/extension_protocols.h ('k') | chrome/browser/extensions/extension_protocols_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698