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

Unified Diff: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.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: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
index 2eaf0ad8b6a993764a29696b64a8a89131537640..2dcb1d243eeac1b469a77a4baf132cea6fde4add 100644
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -70,9 +70,10 @@
#include "chrome/browser/undo/bookmark_undo_service_factory.h"
#include "chrome/browser/web_data_service_factory.h"
#include "chrome/common/features.h"
+#include "extensions/features/features.h"
#include "printing/features/features.h"
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "apps/browser_context_keyed_service_factories.h"
#include "chrome/browser/apps/shortcut_manager_factory.h"
#include "chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.h"
@@ -174,7 +175,7 @@ ChromeBrowserMainExtraPartsProfiles::~ChromeBrowserMainExtraPartsProfiles() {
// static
void ChromeBrowserMainExtraPartsProfiles::
EnsureBrowserContextKeyedServiceFactoriesBuilt() {
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
apps::EnsureBrowserContextKeyedServiceFactoriesBuilt();
extensions::EnsureBrowserContextKeyedServiceFactoriesBuilt();
extensions::ExtensionManagementFactory::GetInstance();
@@ -212,7 +213,7 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {
CrossDevicePromoFactory::GetInstance();
#endif
#if defined(ENABLE_NOTIFICATIONS)
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
ExtensionWelcomeNotificationFactory::GetInstance();
#endif
NotifierStateTrackerFactory::GetInstance();
@@ -221,7 +222,7 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {
dom_distiller::DomDistillerServiceFactory::GetInstance();
domain_reliability::DomainReliabilityServiceFactory::GetInstance();
DownloadServiceFactory::GetInstance();
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
EasyUnlockServiceFactory::GetInstance();
EnhancedBookmarkKeyServiceFactory::GetInstance();
#endif
@@ -238,7 +239,7 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {
#endif
GoogleURLTrackerFactory::GetInstance();
HistoryServiceFactory::GetInstance();
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
HotwordServiceFactory::GetInstance();
#endif
HostContentSettingsMapFactory::GetInstance();
@@ -258,7 +259,7 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {
SupervisedUserSyncServiceFactory::GetInstance();
#endif
#endif
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_MACOSX)
std::unique_ptr<extensions::NetworkingPrivateVerifyDelegateFactoryImpl>
networking_private_verify_delegate_factory(
« no previous file with comments | « chrome/browser/printing/print_view_manager_common.cc ('k') | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698