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

Unified Diff: chrome/browser/prerender/prerender_manager.cc

Issue 15891005: Remove disabling of prerender for managed users. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_manager.cc
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index dc1f78006fdc69b5eaa1c6942eea181cec7ef8e9..1374fd122859cab40b7668d8bf26f34fd3826900 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -59,12 +59,6 @@
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
-#if defined(ENABLE_MANAGED_USERS)
-#include "chrome/browser/managed_mode/managed_mode_url_filter.h"
-#include "chrome/browser/managed_mode/managed_user_service.h"
-#include "chrome/browser/managed_mode/managed_user_service_factory.h"
-#endif
-
using content::BrowserThread;
using content::RenderViewHost;
using content::SessionStorageNamespace;
@@ -1064,18 +1058,6 @@ PrerenderHandle* PrerenderManager::AddPrerender(
if (!IsEnabled())
return NULL;
-#if defined(ENABLE_MANAGED_USERS)
- // Check if the url would be blocked. If yes, don't add the prerender.
- ManagedUserService* service =
- ManagedUserServiceFactory::GetForProfile(profile_);
- if (service->ProfileIsManaged()) {
- ManagedModeURLFilter* filter = service->GetURLFilterForUIThread();
- if (filter->GetFilteringBehaviorForURL(url_arg) ==
- ManagedModeURLFilter::BLOCK)
- return NULL;
- }
-#endif
-
if ((origin == ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN ||
origin == ORIGIN_LINK_REL_PRERENDER_SAMEDOMAIN) &&
IsGoogleSearchResultURL(referrer.url)) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698