Chromium Code Reviews| Index: chrome/renderer/chrome_content_renderer_client.cc |
| diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc |
| index e565ee41ca0eeff0ae731e325546de6cca707005..0fa237971fd98d4bd4ab1be9f6d392d96d7257af 100644 |
| --- a/chrome/renderer/chrome_content_renderer_client.cc |
| +++ b/chrome/renderer/chrome_content_renderer_client.cc |
| @@ -49,6 +49,7 @@ |
| #include "chrome/renderer/page_load_histograms.h" |
| #include "chrome/renderer/plugins/plugin_placeholder.h" |
| #include "chrome/renderer/plugins/plugin_uma.h" |
| +#include "chrome/renderer/prerender/prerender_dispatcher.h" |
| #include "chrome/renderer/prerender/prerender_helper.h" |
| #include "chrome/renderer/prerender/prerender_webmediaplayer.h" |
| #include "chrome/renderer/print_web_view_helper.h" |
| @@ -170,6 +171,7 @@ void ChromeContentRendererClient::RenderThreadStarted() { |
| #if defined(ENABLE_SAFE_BROWSING) |
| phishing_classifier_.reset(safe_browsing::PhishingClassifierFilter::Create()); |
| #endif |
| + prerender_dispatcher_.reset(new prerender::PrerenderDispatcher()); |
| RenderThread* thread = RenderThread::Get(); |
| @@ -181,6 +183,7 @@ void ChromeContentRendererClient::RenderThreadStarted() { |
| #endif |
| thread->AddObserver(spellcheck_.get()); |
| thread->AddObserver(visited_link_slave_.get()); |
| + thread->AddObserver(prerender_dispatcher_.get()); |
| thread->RegisterExtension(extensions_v8::ExternalExtension::Get()); |
| thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get()); |
| @@ -643,6 +646,16 @@ bool ChromeContentRendererClient::ShouldFork(WebFrame* frame, |
| bool is_content_initiated, |
| bool is_initial_navigation, |
| bool* send_referrer) { |
| + DCHECK(!frame->parent()); |
| + DCHECK(is_content_initiated); |
| + |
| + // If |url| matches one of the prerendered URLs, stop this navigation and try |
| + // to swap in the prerendered page on the browser process. If the prerendered |
|
dominich
2012/02/29 18:32:01
If the prerender swap fails for some reason, will
|
| + // page no longer exists by the time the OpenURL IPC is handled, a normal |
| + // navigation is attempted. |
| + if (prerender_dispatcher_->IsPrerenderURL(url)) |
| + return true; |
| + |
| const ExtensionSet* extensions = extension_dispatcher_->extensions(); |
| // Determine if the new URL is an extension (excluding bookmark apps). |