Index: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc |
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc |
index 57315911cf3b4373bce5556fb98007fa99433dc0..90f5eb5635af2d344f0af9af1b19711e3425d92f 100644 |
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc |
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc |
@@ -44,6 +44,10 @@ |
#include "net/http/http_response_headers.h" |
#include "net/url_request/url_request.h" |
+#if defined(ENABLE_MANAGED_USERS) |
+#include "chrome/browser/managed_mode/managed_mode_resource_throttle.h" |
+#endif |
+ |
#if defined(USE_SYSTEM_PROTOBUF) |
#include <google/protobuf/repeated_field.h> |
#else |
@@ -52,8 +56,6 @@ |
#if defined(OS_ANDROID) |
#include "content/components/navigation_interception/intercept_navigation_delegate.h" |
-#else |
-#include "chrome/browser/managed_mode/managed_mode_resource_throttle.h" |
#endif |
#if defined(OS_CHROMEOS) |
@@ -325,10 +327,11 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles( |
} |
#endif |
-#if !defined(OS_ANDROID) |
+#if defined(ENABLE_MANAGED_USERS) |
bool is_subresource_request = resource_type != ResourceType::MAIN_FRAME; |
throttles->push_back(new ManagedModeResourceThrottle( |
- request, child_id, route_id, !is_subresource_request)); |
+ request, child_id, route_id, !is_subresource_request, |
+ io_data->managed_mode_url_filter())); |
not at google - send to devlin
2013/02/01 19:35:50
This broke compile with safe_browsing==0 since io_
|
#endif |
content::ResourceThrottle* throttle = |