diff --git a/cef3/CHROMIUM_BUILD_COMPATIBILITY.txt b/cef3/CHROMIUM_BUILD_COMPATIBILITY.txt index a543afe72..308047772 100644 --- a/cef3/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/cef3/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -16,5 +16,5 @@ # http://dev.chromium.org/developers/how-tos/get-the-code { - 'release_url': 'http://src.chromium.org/svn/releases/25.0.1364.68', + 'release_url': 'http://src.chromium.org/svn/releases/25.0.1364.152', } diff --git a/cef3/libcef/browser/content_browser_client.cc b/cef3/libcef/browser/content_browser_client.cc index 44c52a13f..47b352b34 100644 --- a/cef3/libcef/browser/content_browser_client.cc +++ b/cef3/libcef/browser/content_browser_client.cc @@ -178,7 +178,7 @@ class CefPluginServiceFilter : public content::PluginServiceFilter { CefPluginServiceFilter() {} virtual ~CefPluginServiceFilter() {} - virtual bool ShouldUsePlugin(int render_process_id, + virtual bool IsPluginEnabled(int render_process_id, int render_view_id, const void* context, const GURL& url, @@ -207,6 +207,11 @@ class CefPluginServiceFilter : public content::PluginServiceFilter { return allowed; } + + virtual bool CanLoadPlugin(int render_process_id, + const FilePath& path) OVERRIDE { + return true; + } }; } // namespace