summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/login/login_prompt.cc14
1 files changed, 5 insertions, 9 deletions
diff --git a/chrome/browser/ui/login/login_prompt.cc b/chrome/browser/ui/login/login_prompt.cc
index abf03fc..e30cfd4 100644
--- a/chrome/browser/ui/login/login_prompt.cc
+++ b/chrome/browser/ui/login/login_prompt.cc
@@ -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::BrowserThread;
using content::NavigationController;
using content::RenderViewHost;
using content::RenderViewHostDelegate;
+using content::ResourceRequestInfo;
using content::WebContents;
using webkit::forms::PasswordForm;
@@ -45,12 +46,7 @@ class LoginHandlerImpl;
// 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 @@ LoginHandler::LoginHandler(net::AuthChallengeInfo* auth_info,
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();
}
}