Index: chrome/browser/profiles/profile_impl.cc |
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc |
index 62571b82516de3df883e82d740c172a18cd7bcc6..774779595c24c70a5f8e45b882d285e5064428f7 100644 |
--- a/chrome/browser/profiles/profile_impl.cc |
+++ b/chrome/browser/profiles/profile_impl.cc |
@@ -114,6 +114,7 @@ |
#include "content/public/browser/user_metrics.h" |
#include "content/public/common/content_constants.h" |
#include "content/public/common/page_zoom.h" |
+#include "extensions/features/features.h" |
#include "printing/features/features.h" |
#include "ui/base/l10n/l10n_util.h" |
@@ -137,7 +138,7 @@ |
#include "components/policy/core/common/cloud/user_cloud_policy_manager.h" |
#endif |
-#if defined(ENABLE_EXTENSIONS) |
+#if BUILDFLAG(ENABLE_EXTENSIONS) |
#include "chrome/browser/extensions/extension_service.h" |
#include "chrome/browser/extensions/extension_special_storage_policy.h" |
#include "chrome/browser/ui/webui/extensions/extension_icon_source.h" |
@@ -271,7 +272,7 @@ std::string ExitTypeToSessionTypePrefValue(Profile::ExitType type) { |
PrefStore* CreateExtensionPrefStore(Profile* profile, |
bool incognito_pref_store) { |
-#if defined(ENABLE_EXTENSIONS) |
+#if BUILDFLAG(ENABLE_EXTENSIONS) |
return new ExtensionPrefStore( |
ExtensionPrefValueMapFactory::GetForBrowserContext(profile), |
incognito_pref_store); |
@@ -697,7 +698,7 @@ ProfileImpl::~ProfileImpl() { |
ProfileDestroyer::DestroyOffTheRecordProfileNow( |
off_the_record_profile_.get()); |
} else { |
-#if defined(ENABLE_EXTENSIONS) |
+#if BUILDFLAG(ENABLE_EXTENSIONS) |
ExtensionPrefValueMapFactory::GetForBrowserContext(this)-> |
ClearAllIncognitoSessionOnlyPreferences(); |
#endif |
@@ -767,7 +768,7 @@ Profile* ProfileImpl::GetOffTheRecordProfile() { |
void ProfileImpl::DestroyOffTheRecordProfile() { |
off_the_record_profile_.reset(); |
otr_prefs_->ClearMutableValues(); |
-#if defined(ENABLE_EXTENSIONS) |
+#if BUILDFLAG(ENABLE_EXTENSIONS) |
ExtensionPrefValueMapFactory::GetForBrowserContext(this)-> |
ClearAllIncognitoSessionOnlyPreferences(); |
#endif |
@@ -800,7 +801,7 @@ bool ProfileImpl::IsLegacySupervised() const { |
ExtensionSpecialStoragePolicy* |
ProfileImpl::GetExtensionSpecialStoragePolicy() { |
-#if defined(ENABLE_EXTENSIONS) |
+#if BUILDFLAG(ENABLE_EXTENSIONS) |
if (!extension_special_storage_policy_.get()) { |
TRACE_EVENT0("browser", "ProfileImpl::GetExtensionSpecialStoragePolicy") |
extension_special_storage_policy_ = new ExtensionSpecialStoragePolicy( |
@@ -953,7 +954,7 @@ net::SSLConfigService* ProfileImpl::GetSSLConfigService() { |
} |
content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() { |
-#if defined(ENABLE_EXTENSIONS) |
+#if BUILDFLAG(ENABLE_EXTENSIONS) |
return guest_view::GuestViewManager::FromBrowserContext(this); |
#else |
return NULL; |
@@ -966,7 +967,7 @@ DownloadManagerDelegate* ProfileImpl::GetDownloadManagerDelegate() { |
} |
storage::SpecialStoragePolicy* ProfileImpl::GetSpecialStoragePolicy() { |
-#if defined(ENABLE_EXTENSIONS) |
+#if BUILDFLAG(ENABLE_EXTENSIONS) |
return GetExtensionSpecialStoragePolicy(); |
#else |
return NULL; |