Merge pull request #13 from OsirisNL/cef_2526-1

Made code compatible with the CEF 2526 branch

Author: OsirisNL

shared/browser-client.cpp

@@ -46,16 +46,21 @@ CefRefPtr<CefContextMenuHandler> BrowserClient::GetContextMenuHandler()
 }
 
 bool BrowserClient::OnBeforePopup(CefRefPtr<CefBrowser> browser,
-		CefRefPtr<CefFrame> frame, const CefString& target_url,
-		const CefString& target_frame_name,
-		const CefPopupFeatures& popupFeatures,
-		CefWindowInfo& windowInfo, CefRefPtr<CefClient>& client,
-		CefBrowserSettings& settings, bool* no_javascript_access)
+	CefRefPtr<CefFrame> frame, const CefString& target_url,
+	const CefString& target_frame_name,
+	WindowOpenDisposition target_disposition,
+	bool user_gesture,
+	const CefPopupFeatures& popupFeatures,
+	CefWindowInfo& windowInfo, CefRefPtr<CefClient>& client,
+	CefBrowserSettings& settings,
+	bool* no_javascript_access)
 {
 	(void)browser;
 	(void)frame;
 	(void)target_url;
 	(void)target_frame_name;
+	(void)target_disposition;
+	(void)user_gesture;
 	(void)popupFeatures;
 	(void)windowInfo;
 	(void)client;

shared/browser-client.hpp

@@ -41,6 +41,8 @@ class BrowserClient : public CefClient, public CefLifeSpanHandler,
 	virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser,
 			CefRefPtr<CefFrame> frame, const CefString& target_url,
 			const CefString& target_frame_name,
+			WindowOpenDisposition target_disposition,
+			bool user_gesture,
 			const CefPopupFeatures& popupFeatures,
 			CefWindowInfo& windowInfo, CefRefPtr<CefClient>& client,
 			CefBrowserSettings& settings,

shared/browser-scheme.cpp

@@ -1,6 +1,6 @@
 #include <cctype>
 #include <algorithm>
-#include <include/cef_url.h>
+#include <include/cef_parser.h>
 
 #include "browser-scheme.hpp"
 
@@ -35,7 +35,8 @@ bool BrowserSchemeHandler::ProcessRequest(CefRefPtr<CefRequest> request,
 	CefParseURL(request->GetURL(), parts);
 
 	std::string path = CefString(&parts.path);
-	path = CefURIDecode(path,true,cef_uri_unescape_rule_t::UU_SPACES);
+	path = CefURIDecode(path, true, cef_uri_unescape_rule_t::UU_SPACES);
+	path = CefURIDecode(path, true, cef_uri_unescape_rule_t::UU_NORMAL);
 #ifdef WIN32
 	inputStream.open(path.erase(0,1), std::ifstream::binary);
 #else