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

Unified Diff: chrome/browser/ui/webui/net_internals/net_internals_ui.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
« no previous file with comments | « chrome/browser/ui/webui/log_web_ui_url_unittest.cc ('k') | chrome/browser/ui/webui/policy_ui_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/net_internals/net_internals_ui.cc
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
index 33908b734c10091c9cb95c575fec480a01e7dd36..1e821dcf9bdebbd7b6bee3e1f59cc4f8f31419a5 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -65,6 +65,7 @@
#include "content/public/browser/web_ui.h"
#include "content/public/browser/web_ui_data_source.h"
#include "content/public/browser/web_ui_message_handler.h"
+#include "extensions/features/features.h"
#include "net/base/net_errors.h"
#include "net/disk_cache/disk_cache.h"
#include "net/dns/host_cache.h"
@@ -100,7 +101,7 @@
#include "chrome/browser/net/service_providers_win.h"
#endif
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/ui/webui/extensions/extension_basic_info.h"
#include "extensions/browser/extension_registry.h"
@@ -406,7 +407,7 @@ void NetInternalsMessageHandler::RegisterMessages() {
proxy_->AddRequestContextGetter(
content::BrowserContext::GetDefaultStoragePartition(profile)->
GetMediaURLRequestContext());
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
proxy_->AddRequestContextGetter(profile->GetRequestContextForExtensions());
#endif
@@ -571,7 +572,7 @@ void NetInternalsMessageHandler::OnGetExtensionInfo(
const base::ListValue* list) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
auto extension_list = base::MakeUnique<base::ListValue>();
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
Profile* profile = Profile::FromWebUI(web_ui());
extensions::ExtensionSystem* extension_system =
extensions::ExtensionSystem::Get(profile);
« no previous file with comments | « chrome/browser/ui/webui/log_web_ui_url_unittest.cc ('k') | chrome/browser/ui/webui/policy_ui_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698