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

Unified Diff: components/app_modal/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
Index: components/app_modal/javascript_dialog_manager.cc
diff --git a/components/app_modal/javascript_dialog_manager.cc b/components/app_modal/javascript_dialog_manager.cc
index 9bd127b3afbe0b0eb8e86c174008de48533904cf..65f212fcce0fc902c14b0811c39479e83bcaf7df 100644
--- a/components/app_modal/javascript_dialog_manager.cc
+++ b/components/app_modal/javascript_dialog_manager.cc
@@ -101,7 +101,6 @@ JavaScriptDialogManager::~JavaScriptDialogManager() {
void JavaScriptDialogManager::RunJavaScriptDialog(
content::WebContents* web_contents,
const GURL& origin_url,
- const std::string& accept_lang,
content::JavaScriptMessageType message_type,
const base::string16& message_text,
const base::string16& default_prompt_text,
@@ -152,8 +151,7 @@ void JavaScriptDialogManager::RunJavaScriptDialog(
}
bool is_alert = message_type == content::JAVASCRIPT_MESSAGE_TYPE_ALERT;
- base::string16 dialog_title =
- GetTitle(web_contents, origin_url, accept_lang, is_alert);
+ base::string16 dialog_title = GetTitle(web_contents, origin_url, is_alert);
extensions_client_->OnDialogOpened(web_contents);
@@ -252,7 +250,6 @@ void JavaScriptDialogManager::ResetDialogState(
base::string16 JavaScriptDialogManager::GetTitle(
content::WebContents* web_contents,
const GURL& origin_url,
- const std::string& accept_lang,
bool is_alert) {
// For extensions, show the extension name, but only if the origin of
// the alert matches the top-level WebContents.
@@ -271,8 +268,7 @@ base::string16 JavaScriptDialogManager::GetTitle(
url_formatter::ElideHost(origin_url, gfx::FontList(), kUrlElideWidth);
#else
base::string16 url_string =
- url_formatter::FormatUrlForSecurityDisplayOmitScheme(origin_url,
- accept_lang);
+ url_formatter::FormatUrlForSecurityDisplayOmitScheme(origin_url);
#endif
return l10n_util::GetStringFUTF16(
is_same_origin_as_main_frame ? IDS_JAVASCRIPT_MESSAGEBOX_TITLE

Powered by Google App Engine
This is Rietveld 408576698