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

8
libcef/browser/javascript_dialog_creator.cc
View File

@ -78,7 +78,7 @@ void CefJavaScriptDialogCreator::RunJavaScriptDialog(
content::WebContents* web_contents,
const GURL& origin_url,
const std::string& accept_lang,
ui::JavascriptMessageType javascript_message_type,
content::JavaScriptMessageType message_type,
const string16& message_text,
const string16& default_prompt_text,
const DialogClosedCallback& callback,
@ -95,7 +95,7 @@ void CefJavaScriptDialogCreator::RunJavaScriptDialog(
// Execute the user callback.
bool handled = handler->OnJSDialog(browser_, origin_url.spec(),
accept_lang,
static_cast<cef_jsdialog_type_t>(javascript_message_type),
static_cast<cef_jsdialog_type_t>(message_type),
message_text, default_prompt_text, callbackPtr.get(),
*did_suppress_message);
if (handled)
@ -119,7 +119,7 @@ void CefJavaScriptDialogCreator::RunJavaScriptDialog(
string16 display_url = net::FormatUrl(origin_url, accept_lang);
dialog_.reset(new CefJavaScriptDialog(this,
javascript_message_type,
message_type,
display_url,
message_text,
default_prompt_text,
@ -165,7 +165,7 @@ void CefJavaScriptDialogCreator::RunBeforeUnloadDialog(
ASCIIToUTF16("\n\nIs it OK to leave/reload this page?");
dialog_.reset(new CefJavaScriptDialog(this,
ui::JAVASCRIPT_MESSAGE_TYPE_CONFIRM,
content::JAVASCRIPT_MESSAGE_TYPE_CONFIRM,
string16(), // display_url
new_message_text,
string16(), // default_prompt_text