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

Unified Diff: chrome/browser/sync/glue/extensions_activity_monitor.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/sync/glue/extensions_activity_monitor.cc
diff --git a/chrome/browser/sync/glue/extensions_activity_monitor.cc b/chrome/browser/sync/glue/extensions_activity_monitor.cc
index a3c735e046ca738fbaba53564ba2046477ef6f56..60d2284a3915396162138052461cf0079aece541 100644
--- a/chrome/browser/sync/glue/extensions_activity_monitor.cc
+++ b/chrome/browser/sync/glue/extensions_activity_monitor.cc
@@ -6,8 +6,9 @@
#include "components/sync/base/extensions_activity.h"
#include "content/public/browser/browser_thread.h"
+#include "extensions/features/features.h"
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h"
#include "content/public/browser/notification_service.h"
@@ -26,7 +27,7 @@ ExtensionsActivityMonitor::ExtensionsActivityMonitor()
// the fly so there is no reliable object to point to (same problem if we
// wanted to use the string name). Thus, we use all sources and filter in
// Observe.
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
registrar_.Add(this,
extensions::NOTIFICATION_EXTENSION_BOOKMARKS_API_INVOKED,
content::NotificationService::AllSources());
@@ -41,7 +42,7 @@ void ExtensionsActivityMonitor::Observe(
int type,
const content::NotificationSource& source,
const content::NotificationDetails& details) {
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK_EQ(extensions::NOTIFICATION_EXTENSION_BOOKMARKS_API_INVOKED, type);
const extensions::Extension* extension =
« no previous file with comments | « chrome/browser/sync/glue/extensions_activity_monitor.h ('k') | chrome/browser/sync/profile_sync_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698