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

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

Issue 14471033: Don't prerender if an interstitial would be shown. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT. Created 7 years, 8 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 31e82daade2e19f8227657d18a8b0abbfb687d67..9e9be12bf46d7ea1d5965effad5ce24255cb440a 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -59,6 +59,12 @@
#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;
@@ -1050,6 +1056,18 @@ 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