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

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

Issue 9580002: Add ResourceRequestInfo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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 | « chrome/browser/task_manager/task_manager.cc ('k') | content/browser/download/download_resource_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/login/login_prompt.cc
===================================================================
--- chrome/browser/ui/login/login_prompt.cc (revision 125418)
+++ chrome/browser/ui/login/login_prompt.cc (working copy)
@@ -16,12 +16,12 @@
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/common/chrome_notification_types.h"
#include "content/browser/renderer_host/resource_dispatcher_host.h"
-#include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/render_view_host_delegate.h"
+#include "content/public/browser/resource_request_info.h"
#include "content/public/browser/web_contents.h"
#include "grit/generated_resources.h"
#include "net/base/auth.h"
@@ -36,6 +36,7 @@
using content::NavigationController;
using content::RenderViewHost;
using content::RenderViewHostDelegate;
+using content::ResourceRequestInfo;
using content::WebContents;
using webkit::forms::PasswordForm;
@@ -45,12 +46,7 @@
// Should only be called from the IO thread, since it accesses an
// net::URLRequest.
void ResetLoginHandlerForRequest(net::URLRequest* request) {
- ResourceDispatcherHostRequestInfo* info =
- ResourceDispatcherHost::InfoForRequest(request);
- if (!info)
- return;
-
- info->set_login_delegate(NULL);
+ ResourceDispatcherHost::ClearLoginDelegate(request);
}
// Get the signon_realm under which this auth info should be stored.
@@ -102,8 +98,8 @@
BrowserThread::UI, FROM_HERE,
base::Bind(&LoginHandler::AddObservers, this));
- if (!ResourceDispatcherHost::RenderViewForRequest(
- request_, &render_process_host_id_, &tab_contents_id_)) {
+ if (!ResourceRequestInfo::ForRequest(request_)->GetAssociatedRenderView(
+ &render_process_host_id_, &tab_contents_id_)) {
NOTREACHED();
}
}
« no previous file with comments | « chrome/browser/task_manager/task_manager.cc ('k') | content/browser/download/download_resource_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698