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

Unified Diff: chrome/browser/profiles/profile_io_data.cc

Issue 10824257: Add ManagedModeURLFilter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: compile fix Created 8 years, 4 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_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index d9904abe7a0f7ffa313c2bb5dc01068fd3fa6700..bc4590c675e1a4fd063c2fdc96308289380b8112 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -64,6 +64,10 @@
#include "net/url_request/data_protocol_handler.h"
#include "net/url_request/url_request.h"
+#if !defined(OS_ANDROID)
+#include "chrome/browser/managed_mode.h"
+#endif
+
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/gdata/gdata_protocol_handler.h"
#include "chrome/browser/chromeos/gview_request_interceptor.h"
@@ -479,6 +483,11 @@ void ProfileIOData::LazyInitialize() const {
io_thread_globals->extension_event_router_forwarder.get(),
profile_params_->extension_info_map,
url_blacklist_manager_.get(),
+#if !defined(OS_ANDROID)
+ ManagedMode::GetURLFilter(),
+#else
+ NULL,
+#endif
profile_params_->profile,
profile_params_->cookie_settings,
&enable_referrers_,
« no previous file with comments | « chrome/browser/net/chrome_network_delegate_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698