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

Browse Source 
- Pass popup window attributes to CefLifeSpanHandler::OnBeforePopup (issue #520).
- Windows: Add manifest files for all binary targets and include compatibility manifest in *.exe targets.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1367 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-08-15 19:38:55 +00:00
parent 0a452addf0
commit cdd7333b76
22 changed files with 188 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libcef/browser/javascript_dialog_manager.cc
View File

@ -186,7 +186,7 @@ void CefJavaScriptDialogManager::RunBeforeUnloadDialog(
#endif
}
void CefJavaScriptDialogManager::ResetJavaScriptState(
void CefJavaScriptDialogManager::CancelActiveAndPendingDialogs(
content::WebContents* web_contents) {
CefRefPtr<CefClient> client = browser_->GetClient();
if (client.get()) {
@ -205,6 +205,10 @@ void CefJavaScriptDialogManager::ResetJavaScriptState(
#endif
}
void CefJavaScriptDialogManager::WebContentsDestroyed(
content::WebContents* web_contents) {
}
void CefJavaScriptDialogManager::DialogClosed(CefJavaScriptDialog* dialog) {
#if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK)
DCHECK_EQ(dialog, dialog_.get());