summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-02 22:20:36 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-02 22:20:36 +0000
commit15197f69d61f786fd953dd44ac417100c055433c (patch)
tree7ff87ad9b8c2cd9cb8970b1f83a044244f49d280 /chrome/browser
parent1a7bc66e84e56a5429ac7b0e9d81d6d93a1b5df2 (diff)
downloadchromium_src-15197f69d61f786fd953dd44ac417100c055433c.zip
chromium_src-15197f69d61f786fd953dd44ac417100c055433c.tar.gz
chromium_src-15197f69d61f786fd953dd44ac417100c055433c.tar.bz2
Return an error code to extensions requesting a resource that requires basic
HTTP authentication. BUG=31388 TEST=test that basic HTTP authentication still works Review URL: http://codereview.chromium.org/2824063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/login_prompt.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/login_prompt.cc b/chrome/browser/login_prompt.cc
index 0061e9c..f8074e0 100644
--- a/chrome/browser/login_prompt.cc
+++ b/chrome/browser/login_prompt.cc
@@ -364,7 +364,10 @@ class LoginDialogTask : public Task {
void Run() {
TabContents* parent_contents = handler_->GetTabContentsForLogin();
if (!parent_contents) {
- // The request was probably cancelled.
+ // The request may have been cancelled, or it may be for a renderer
+ // not hosted by a tab (e.g. an extension). Cancel just in case
+ // (cancelling twice is a no-op).
+ handler_->CancelAuth();
return;
}