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_win.cc
View File

@ -27,7 +27,7 @@ INT_PTR CALLBACK CefJavaScriptDialogRunnerWin::DialogProc(
reinterpret_cast<CefJavaScriptDialogRunnerWin*>(lparam);
owner->dialog_win_ = dialog;
SetDlgItemText(dialog, IDC_DIALOGTEXT, owner->message_text_.c_str());
if (owner->message_type_ == content::JAVASCRIPT_MESSAGE_TYPE_PROMPT)
if (owner->message_type_ == content::JAVASCRIPT_DIALOG_TYPE_PROMPT)
SetDlgItemText(dialog, IDC_PROMPTEDIT,
owner->default_prompt_text_.c_str());
break;
@ -57,7 +57,7 @@ INT_PTR CALLBACK CefJavaScriptDialogRunnerWin::DialogProc(
case IDOK:
finish = true;
result = true;
if (owner->message_type_ == content::JAVASCRIPT_MESSAGE_TYPE_PROMPT) {
if (owner->message_type_ == content::JAVASCRIPT_DIALOG_TYPE_PROMPT) {
size_t length =
GetWindowTextLength(GetDlgItem(dialog, IDC_PROMPTEDIT)) + 1;
if (length > 1) {
@ -95,7 +95,7 @@ CefJavaScriptDialogRunnerWin::~CefJavaScriptDialogRunnerWin() {
void CefJavaScriptDialogRunnerWin::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,
@ -111,11 +111,11 @@ void CefJavaScriptDialogRunnerWin::Run(
hook_installed_ = true;
int dialog_type;
if (message_type == content::JAVASCRIPT_MESSAGE_TYPE_ALERT)
if (message_type == content::JAVASCRIPT_DIALOG_TYPE_ALERT)
dialog_type = IDD_ALERT;
else if (message_type == content::JAVASCRIPT_MESSAGE_TYPE_CONFIRM)
else if (message_type == content::JAVASCRIPT_DIALOG_TYPE_CONFIRM)
dialog_type = IDD_CONFIRM;
else // JAVASCRIPT_MESSAGE_TYPE_PROMPT
else // JAVASCRIPT_DIALOG_TYPE_PROMPT
dialog_type = IDD_PROMPT;
base::FilePath file_path;