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

Unified Diff: components/content_settings/core/browser/cookie_settings.cc

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: components/content_settings/core/browser/cookie_settings.cc
diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
index 2d5730ef3ba990b2082c6d662735a72d23ca2249..b5db52bd2581bba29c2a8b508f794ab8f945db67 100644
--- a/components/content_settings/core/browser/cookie_settings.cc
+++ b/components/content_settings/core/browser/cookie_settings.cc
@@ -12,6 +12,7 @@
#include "components/content_settings/core/common/pref_names.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/pref_service.h"
+#include "extensions/features/features.h"
#include "net/base/net_errors.h"
#include "net/base/static_cookie_policy.h"
#include "url/gurl.h"
@@ -129,7 +130,7 @@ ContentSetting CookieSettings::GetCookieSetting(const GURL& url,
if (url.SchemeIsCryptographic() && first_party_url.SchemeIs(kChromeUIScheme))
return CONTENT_SETTING_ALLOW;
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
if (url.SchemeIs(kExtensionScheme) &&
first_party_url.SchemeIs(kExtensionScheme)) {
return CONTENT_SETTING_ALLOW;
« no previous file with comments | « components/content_settings/core/browser/DEPS ('k') | components/content_settings/core/browser/cookie_settings_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698