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 revision 939b32ee (#454471)

Browse Source
This commit is contained in:
Marshall Greenblatt
2017-03-03 17:37:23 -05:00
parent fe68aee82c
commit 54647945f1
127 changed files with 1874 additions and 964 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,7 @@ CefJavaScriptDialogRunnerMac::~CefJavaScriptDialogRunnerMac() {
void CefJavaScriptDialogRunnerMac::Run(
CefBrowserHostImpl* browser,
content::JavaScriptMessageType message_type,
content::JavaScriptDialogType message_type,
const base::string16& display_url,
const base::string16& message_text,
const base::string16& default_prompt_text,
@ -98,9 +98,9 @@ void CefJavaScriptDialogRunnerMac::Run(
callback_ = callback;
bool text_field =
message_type == content::JAVASCRIPT_MESSAGE_TYPE_PROMPT;
message_type == content::JAVASCRIPT_DIALOG_TYPE_PROMPT;
bool one_button =
message_type == content::JAVASCRIPT_MESSAGE_TYPE_ALERT;
message_type == content::JAVASCRIPT_DIALOG_TYPE_ALERT;
helper_.reset(
[[CefJavaScriptDialogHelper alloc] initHelperWithCallback:
@ -119,13 +119,13 @@ void CefJavaScriptDialogRunnerMac::Run(
base::string16 label;
switch (message_type) {
case content::JAVASCRIPT_MESSAGE_TYPE_ALERT:
case content::JAVASCRIPT_DIALOG_TYPE_ALERT:
label = base::ASCIIToUTF16("JavaScript Alert");
break;
case content::JAVASCRIPT_MESSAGE_TYPE_PROMPT:
case content::JAVASCRIPT_DIALOG_TYPE_PROMPT:
label = base::ASCIIToUTF16("JavaScript Prompt");
break;
case content::JAVASCRIPT_MESSAGE_TYPE_CONFIRM:
case content::JAVASCRIPT_DIALOG_TYPE_CONFIRM:
label = base::ASCIIToUTF16("JavaScript Confirm");
break;
}