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 139606.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@658 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-05-31 15:19:33 +00:00
parent dbe75b1326
commit 38f216a9c2
29 changed files with 114 additions and 765 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libcef/browser/javascript_dialog_mac.mm
View File

@@ -88,7 +88,7 @@
CefJavaScriptDialog::CefJavaScriptDialog(
CefJavaScriptDialogCreator* creator,
ui::JavascriptMessageType javascript_message_type,
content::JavaScriptMessageType message_type,
const string16& display_url,
const string16& message_text,
const string16& default_prompt_text,
@@ -96,9 +96,9 @@ CefJavaScriptDialog::CefJavaScriptDialog(
: creator_(creator),
callback_(callback) {
bool text_field =
javascript_message_type == ui::JAVASCRIPT_MESSAGE_TYPE_PROMPT;
message_type == content::JAVASCRIPT_MESSAGE_TYPE_PROMPT;
bool one_button =
javascript_message_type == ui::JAVASCRIPT_MESSAGE_TYPE_ALERT;
message_type == content::JAVASCRIPT_MESSAGE_TYPE_ALERT;
helper_ =
[[CefJavaScriptDialogHelper alloc] initHelperWithCreator:creator
@@ -115,14 +115,14 @@ CefJavaScriptDialog::CefJavaScriptDialog(
[alert setInformativeText:base::SysUTF16ToNSString(message_text)];
string16 label;
switch (javascript_message_type) {
case ui::JAVASCRIPT_MESSAGE_TYPE_ALERT:
switch (message_type) {
case content::JAVASCRIPT_MESSAGE_TYPE_ALERT:
label = ASCIIToUTF16("JavaScript Alert");
break;
case ui::JAVASCRIPT_MESSAGE_TYPE_PROMPT:
case content::JAVASCRIPT_MESSAGE_TYPE_PROMPT:
label = ASCIIToUTF16("JavaScript Prompt");
break;
case ui::JAVASCRIPT_MESSAGE_TYPE_CONFIRM:
case content::JAVASCRIPT_MESSAGE_TYPE_CONFIRM:
label = ASCIIToUTF16("JavaScript Confirm");
break;
}