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

Unified Diff: chrome/browser/ui/login/login_prompt.cc

Issue 124113003: Remove calls of PrerenderTracker::TryCancel and TryCancelOnIOThread in ChromeResourceDispatcherHost… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 12 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
Index: chrome/browser/ui/login/login_prompt.cc
===================================================================
--- chrome/browser/ui/login/login_prompt.cc (revision 242921)
+++ chrome/browser/ui/login/login_prompt.cc (working copy)
@@ -12,6 +12,9 @@
#include "base/synchronization/lock.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/password_manager/password_manager.h"
+#include "chrome/browser/prerender/prerender_manager.h"
+#include "chrome/browser/prerender/prerender_manager_factory.h"
+#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/tab_contents/tab_util.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_registrar.h"
@@ -427,6 +430,19 @@
return;
}
+ prerender::PrerenderManager* prerender_manager =
+ prerender::PrerenderManagerFactory::GetForProfile(
+ Profile::FromBrowserContext(parent_contents->GetBrowserContext()));
+ if (prerender_manager) {
+ prerender::PrerenderContents* prerender_contents =
+ prerender_manager->GetPrerenderContents(parent_contents);
+ if (prerender_contents) {
+ prerender_contents->Destroy(
+ prerender::FINAL_STATUS_AUTH_NEEDED);
+ return;
+ }
+ }
+
PasswordManager* password_manager =
PasswordManager::FromWebContents(parent_contents);
if (!password_manager) {

Powered by Google App Engine
This is Rietveld 408576698