content/shell/browser/shell_javascript_dialog_manager.cc - Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode

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_javascript_dialog_manager.cc

Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix typo in elide_url.cc Created 4 years, 8 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 | « content/shell/browser/shell_javascript_dialog_manager.h ('k') | extensions/browser/guest_view/web_view/javascript_dialog_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/browser/shell_javascript_dialog_manager.cc

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

index 2ed26848f9946e735ed3dcc0045777845ecff49f..ee737b72835079dd252bcf43c6f295dedad8eaae 100644

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

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

@@ -24,7 +24,6 @@ ShellJavaScriptDialogManager::~ShellJavaScriptDialogManager() {

void ShellJavaScriptDialogManager::RunJavaScriptDialog(

WebContents* web_contents,

const GURL& origin_url,

- const std::string& accept_lang,

JavaScriptMessageType javascript_message_type,

const base::string16& message_text,

const base::string16& default_prompt_text,

@@ -47,7 +46,7 @@ void ShellJavaScriptDialogManager::RunJavaScriptDialog(

}

base::string16 new_message_text =

- url_formatter::FormatUrl(origin_url, accept_lang) +

+ url_formatter::FormatUrl(origin_url) +

base::ASCIIToUTF16("\n\n") + message_text;

gfx::NativeWindow parent_window = web_contents->GetTopLevelNativeWindow();