bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 91.0.4472.0 (#870763)

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-04-20 18:52:34 -04:00
parent b189c7b472
commit ae4f68f695
193 changed files with 1381 additions and 1897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libcef/browser/native/javascript_dialog_runner_mac.mm
View File

@ -65,7 +65,7 @@
return;
bool success = returnCode == NSAlertFirstButtonReturn;
base::string16 input;
std::u16string input;
if (textField_)
input = base::SysNSStringToUTF16([textField_ stringValue]);
@ -89,9 +89,9 @@ CefJavaScriptDialogRunnerMac::~CefJavaScriptDialogRunnerMac() {
void CefJavaScriptDialogRunnerMac::Run(
AlloyBrowserHostImpl* browser,
content::JavaScriptDialogType message_type,
const base::string16& display_url,
const base::string16& message_text,
const base::string16& default_prompt_text,
const std::u16string& display_url,
const std::u16string& message_text,
const std::u16string& default_prompt_text,
DialogClosedCallback callback) {
DCHECK(!helper_.get());
callback_ = std::move(callback);
@ -114,20 +114,20 @@ void CefJavaScriptDialogRunnerMac::Run(
[alert setDelegate:helper_];
[alert setInformativeText:base::SysUTF16ToNSString(message_text)];
base::string16 label;
std::u16string label;
switch (message_type) {
case content::JAVASCRIPT_DIALOG_TYPE_ALERT:
label = base::ASCIIToUTF16("JavaScript Alert");
label = u"JavaScript Alert";
break;
case content::JAVASCRIPT_DIALOG_TYPE_PROMPT:
label = base::ASCIIToUTF16("JavaScript Prompt");
label = u"JavaScript Prompt";
break;
case content::JAVASCRIPT_DIALOG_TYPE_CONFIRM:
label = base::ASCIIToUTF16("JavaScript Confirm");
label = u"JavaScript Confirm";
break;
}
if (!display_url.empty())
label += base::ASCIIToUTF16(" - ") + display_url;
label += u" - " + display_url;
[alert setMessageText:base::SysUTF16ToNSString(label)];
@ -165,7 +165,7 @@ void CefJavaScriptDialogRunnerMac::Cancel() {
void CefJavaScriptDialogRunnerMac::DialogClosed(
bool success,
const base::string16& user_input) {
const std::u16string& user_input) {
helper_.reset(nil);
std::move(callback_).Run(success, user_input);
}