From 30b602cd8d906a775dc75f7fa5a5aa683195be57 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 5 May 2015 19:31:16 -0400 Subject: [PATCH] Update to Chromium version 43.0.2357.45 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- libcef/browser/javascript_dialog_manager.cc | 2 +- libcef/browser/javascript_dialog_manager.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 3d38a8c48..60d342924 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,5 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/43.0.2357.18', + 'chromium_checkout': 'refs/tags/43.0.2357.45', } diff --git a/libcef/browser/javascript_dialog_manager.cc b/libcef/browser/javascript_dialog_manager.cc index 6e8ce3103..83e360188 100644 --- a/libcef/browser/javascript_dialog_manager.cc +++ b/libcef/browser/javascript_dialog_manager.cc @@ -208,7 +208,7 @@ void CefJavaScriptDialogManager::CancelActiveAndPendingDialogs( #endif } -void CefJavaScriptDialogManager::WebContentsDestroyed( +void CefJavaScriptDialogManager::ResetDialogState( content::WebContents* web_contents) { } diff --git a/libcef/browser/javascript_dialog_manager.h b/libcef/browser/javascript_dialog_manager.h index 221050743..fa02a67ac 100644 --- a/libcef/browser/javascript_dialog_manager.h +++ b/libcef/browser/javascript_dialog_manager.h @@ -41,7 +41,7 @@ class CefJavaScriptDialogManager : public content::JavaScriptDialogManager { void CancelActiveAndPendingDialogs( content::WebContents* web_contents) override; - void WebContentsDestroyed( + void ResetDialogState( content::WebContents* web_contents) override; // Called by the CefJavaScriptDialog when it closes.