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

Unified Diff: chrome/browser/loader/chrome_resource_dispatcher_host_delegate.h

Issue 2479593006: Move enable extensions define to a build flag. (Closed)
Patch Set: Merge Created 4 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/loader/chrome_resource_dispatcher_host_delegate.h
diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.h b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.h
index 2ac6a6df94e7319864bd2b71cda989651a47c501..f605d8025ba64699e6d9aae3989ae9d62d588741 100644
--- a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.h
+++ b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.h
@@ -14,6 +14,7 @@
#include "base/memory/ref_counted.h"
#include "chrome/browser/external_protocol/external_protocol_handler.h"
#include "content/public/browser/resource_dispatcher_host_delegate.h"
+#include "extensions/features/features.h"
class DelayedResourceQueue;
class DownloadRequestLimiter;
@@ -106,7 +107,7 @@ class ChromeResourceDispatcherHostDelegate
ScopedVector<content::ResourceThrottle>* throttles);
private:
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
struct StreamTargetInfo {
std::string extension_id;
std::string view_id;
@@ -115,7 +116,7 @@ class ChromeResourceDispatcherHostDelegate
scoped_refptr<DownloadRequestLimiter> download_request_limiter_;
scoped_refptr<safe_browsing::SafeBrowsingService> safe_browsing_;
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
scoped_refptr<extensions::UserScriptListener> user_script_listener_;
std::map<net::URLRequest*, StreamTargetInfo> stream_target_info_;
#endif
« no previous file with comments | « chrome/browser/io_thread_unittest.cc ('k') | chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698