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

Unified Diff: chrome/browser/net/chrome_network_delegate.cc

Issue 1786263002: Remove uses of ENABLE_CONFIGURATION_POLICY from src/chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sort Created 4 years, 9 months 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/net/chrome_network_delegate.h ('k') | chrome/browser/policy/profile_policy_connector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/chrome_network_delegate.cc
diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
index fa9ba6d35deb4ef81011674c72454785d22cbf36..ee6dff8e6cfcd91d612f1c1152431c0d502033e5 100644
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -42,6 +42,7 @@
#include "components/content_settings/core/browser/cookie_settings.h"
#include "components/data_usage/core/data_use_aggregator.h"
#include "components/domain_reliability/monitor.h"
+#include "components/policy/core/browser/url_blacklist_manager.h"
#include "components/prefs/pref_member.h"
#include "components/prefs/pref_service.h"
#include "content/public/browser/browser_thread.h"
@@ -72,10 +73,6 @@
#include "chrome/common/chrome_switches.h"
#endif
-#if defined(ENABLE_CONFIGURATION_POLICY)
-#include "components/policy/core/browser/url_blacklist_manager.h"
-#endif
-
#if defined(ENABLE_EXTENSIONS)
#include "extensions/common/constants.h"
#endif
@@ -295,9 +292,7 @@ ChromeNetworkDelegate::ChromeNetworkDelegate(
enable_do_not_track_(NULL),
force_google_safe_search_(NULL),
force_youtube_safety_mode_(NULL),
-#if defined(ENABLE_CONFIGURATION_POLICY)
url_blacklist_manager_(NULL),
-#endif
domain_reliability_monitor_(NULL),
experimental_web_platform_features_enabled_(
base::CommandLine::ForCurrentProcess()
@@ -382,7 +377,6 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"456327 URLRequest::ChromeNetworkDelegate::OnBeforeURLRequest"));
-#if defined(ENABLE_CONFIGURATION_POLICY)
// TODO(joaodasilva): This prevents extensions from seeing URLs that are
// blocked. However, an extension might redirect the request to another URL,
// which is not blocked.
@@ -400,7 +394,6 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
&request->url().possibly_invalid_spec()));
return error;
}
-#endif
// TODO(mmenke): Remove ScopedTracker below once crbug.com/456327 is fixed.
tracked_objects::ScopedTracker tracking_profile2(
« no previous file with comments | « chrome/browser/net/chrome_network_delegate.h ('k') | chrome/browser/policy/profile_policy_connector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698