| Index: chrome/browser/chrome_content_browser_client.cc
|
| ===================================================================
|
| --- chrome/browser/chrome_content_browser_client.cc (revision 243184)
|
| +++ chrome/browser/chrome_content_browser_client.cc (working copy)
|
| @@ -572,6 +572,13 @@
|
| if (!tab)
|
| return;
|
|
|
| + prerender::PrerenderContents* prerender_contents =
|
| + prerender::PrerenderContents::FromWebContents(tab);
|
| + if (prerender_contents) {
|
| + prerender_contents->Destroy(prerender::FINAL_STATUS_CREATE_NEW_WINDOW);
|
| + return;
|
| + }
|
| +
|
| PopupBlockerTabHelper* popup_helper =
|
| PopupBlockerTabHelper::FromWebContents(tab);
|
| if (!popup_helper)
|
| @@ -2083,14 +2090,6 @@
|
| return false;
|
| }
|
|
|
| - if (g_browser_process->prerender_tracker() &&
|
| - g_browser_process->prerender_tracker()->TryCancelOnIOThread(
|
| - render_process_id,
|
| - opener_id,
|
| - prerender::FINAL_STATUS_CREATE_NEW_WINDOW)) {
|
| - return false;
|
| - }
|
| -
|
| if (is_guest)
|
| return true;
|
|
|
|
|