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

Unified Diff: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Issue 10836031: Remove Instant v1 API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Build fix Created 8 years, 4 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/renderer_host/chrome_resource_dispatcher_host_delegate.cc
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
index d0157be18043a254272aace778c8676788b46e56..516f3736386fdf2157712731a3391ec3204d9697 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -16,7 +16,6 @@
#include "chrome/browser/extensions/user_script_listener.h"
#include "chrome/browser/external_protocol/external_protocol_handler.h"
#include "chrome/browser/google/google_util.h"
-#include "chrome/browser/instant/instant_loader.h"
#include "chrome/browser/net/load_timing_observer.h"
#include "chrome/browser/net/resource_prefetch_predictor_observer.h"
#include "chrome/browser/prerender/prerender_manager.h"
@@ -235,17 +234,6 @@ bool ChromeResourceDispatcherHostDelegate::AcceptAuthRequest(
ResourceDispatcherHostLoginDelegate*
ChromeResourceDispatcherHostDelegate::CreateLoginDelegate(
net::AuthChallengeInfo* auth_info, net::URLRequest* request) {
- std::string instant_header_value;
- // For instant, return a NULL delegate. Auth navigations don't commit the load
sky 2012/08/07 15:57:21 How is this dealt with now?
sreeram 2012/08/07 16:35:03 No need to deal with this now, I think. This was a
- // (the load remains pending) until the user cancels or succeeds in
- // authorizing. Since we don't allow merging of WebContents with pending loads
- // we disallow auth dialogs from showing during instant. Returning NULL does
- // that.
- // TODO: see if we can handle this case more robustly.
- if (request->extra_request_headers().GetHeader(
- InstantLoader::kInstantHeader, &instant_header_value) &&
- instant_header_value == InstantLoader::kInstantHeaderValue)
- return NULL;
return CreateLoginPrompt(auth_info, request);
}

Powered by Google App Engine
This is Rietveld 408576698