content/shell/browser/shell_login_dialog.cc - Issue 2067933002: Use correct origin when prompting for proxy authentication.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/shell/browser/shell_login_dialog.cc

Issue 2067933002: Use correct origin when prompting for proxy authentication. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix content_shell build. Created 4 years, 6 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: content/shell/browser/shell_login_dialog.cc

diff --git a/content/shell/browser/shell_login_dialog.cc b/content/shell/browser/shell_login_dialog.cc

index 99d18be32db729de4c1a7c3ca6b82d11d40252e0..bba3a2b3d368d0fb9e3d3333d1cdf714b4382e8c 100644

--- a/content/shell/browser/shell_login_dialog.cc

+++ b/content/shell/browser/shell_login_dialog.cc

@@ -8,6 +8,7 @@

#include "base/logging.h"

#include "base/strings/utf_string_conversions.h"

#include "build/build_config.h"

+#include "components/url_formatter/elide_url.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/resource_dispatcher_host.h"

#include "net/base/auth.h"

@@ -23,9 +24,10 @@ ShellLoginDialog::ShellLoginDialog(

DCHECK_CURRENTLY_ON(BrowserThread::IO);

BrowserThread::PostTask(

BrowserThread::UI, FROM_HERE,

- base::Bind(&ShellLoginDialog::PrepDialog, this,

- base::ASCIIToUTF16(auth_info->challenger.ToString()),

- base::UTF8ToUTF16(auth_info->realm)));

+ base::Bind(

+ &ShellLoginDialog::PrepDialog, this,

+ url_formatter::FormatOriginForSecurityDisplay(auth_info->challenger),

+ base::UTF8ToUTF16(auth_info->realm)));

}

void ShellLoginDialog::OnRequestCancelled() {

« no previous file with comments | « chrome/browser/ui/login/login_handler_unittest.cc ('k') | net/base/auth.h » ('j') | no next file with comments »