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

Unified Diff: chrome/browser/tab_contents/tab_util.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/tab_contents/tab_util.cc
diff --git a/chrome/browser/tab_contents/tab_util.cc b/chrome/browser/tab_contents/tab_util.cc
index bcc22d4ab5aa81d5c3c12e290438688276f8f8f6..fbe9e9e95ac78cddcd0924aeec4fbecfaf847637 100644
--- a/chrome/browser/tab_contents/tab_util.cc
+++ b/chrome/browser/tab_contents/tab_util.cc
@@ -11,9 +11,10 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/site_instance.h"
#include "content/public/browser/web_contents.h"
+#include "extensions/features/features.h"
#include "url/gurl.h"
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "extensions/browser/extension_registry.h"
#endif
@@ -49,7 +50,7 @@ scoped_refptr<SiteInstance> GetSiteInstanceForNewTab(Profile* profile,
if (ChromeWebUIControllerFactory::GetInstance()->UseWebUIForURL(profile, url))
return SiteInstance::CreateForURL(profile, url);
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
if (extensions::ExtensionRegistry::Get(
profile)->enabled_extensions().GetHostedAppByURL(url))
return SiteInstance::CreateForURL(profile, url);

Powered by Google App Engine
This is Rietveld 408576698