Skip to content

Commit a54e7c4

Browse files
WizardCMRytoEX
authored andcommitted
Enable building with CEF 6834
OnBeforePopup gained a popup_id. No other changes required.
1 parent a0a0edc commit a54e7c4

File tree

4 files changed

+21
-7
lines changed

4 files changed

+21
-7
lines changed

browser-client.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,13 @@ CefResourceRequestHandler::ReturnValue BrowserClient::OnBeforeResourceLoad(CefRe
122122
}
123123
#endif
124124

125-
bool BrowserClient::OnBeforePopup(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, const CefString &, const CefString &,
126-
cef_window_open_disposition_t, bool, const CefPopupFeatures &, CefWindowInfo &,
127-
CefRefPtr<CefClient> &, CefBrowserSettings &, CefRefPtr<CefDictionaryValue> &, bool *)
125+
bool BrowserClient::OnBeforePopup(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>,
126+
#if CHROME_VERSION_BUILD >= 6834
127+
int,
128+
#endif
129+
const CefString &, const CefString &, cef_window_open_disposition_t, bool,
130+
const CefPopupFeatures &, CefWindowInfo &, CefRefPtr<CefClient> &,
131+
CefBrowserSettings &, CefRefPtr<CefDictionaryValue> &, bool *)
128132
{
129133
/* block popups */
130134
return true;

browser-client.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ class BrowserClient : public CefClient,
8787

8888
/* CefLifeSpanHandler */
8989
virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
90+
#if CHROME_VERSION_BUILD >= 6834
91+
int popup_id,
92+
#endif
9093
const CefString &target_url, const CefString &target_frame_name,
9194
cef_window_open_disposition_t target_disposition, bool user_gesture,
9295
const CefPopupFeatures &popupFeatures, CefWindowInfo &windowInfo,

panel/browser-panel-client.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,14 @@ void QCefBrowserClient::OnLoadError(CefRefPtr<CefBrowser> browser, CefRefPtr<Cef
172172
}
173173

174174
/* CefLifeSpanHandler */
175-
bool QCefBrowserClient::OnBeforePopup(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, const CefString &target_url,
176-
const CefString &, CefLifeSpanHandler::WindowOpenDisposition, bool,
177-
const CefPopupFeatures &, CefWindowInfo &windowInfo, CefRefPtr<CefClient> &,
178-
CefBrowserSettings &, CefRefPtr<CefDictionaryValue> &, bool *)
175+
bool QCefBrowserClient::OnBeforePopup(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>,
176+
#if CHROME_VERSION_BUILD >= 6834
177+
int,
178+
#endif
179+
const CefString &target_url, const CefString &,
180+
CefLifeSpanHandler::WindowOpenDisposition, bool, const CefPopupFeatures &,
181+
CefWindowInfo &windowInfo, CefRefPtr<CefClient> &, CefBrowserSettings &,
182+
CefRefPtr<CefDictionaryValue> &, bool *)
179183
{
180184
if (allowAllPopups) {
181185
#ifdef _WIN32

panel/browser-panel-client.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ class QCefBrowserClient : public CefClient,
5151

5252
/* CefLifeSpanHandler */
5353
virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
54+
#if CHROME_VERSION_BUILD >= 6834
55+
int popup_id,
56+
#endif
5457
const CefString &target_url, const CefString &target_frame_name,
5558
CefLifeSpanHandler::WindowOpenDisposition target_disposition, bool user_gesture,
5659
const CefPopupFeatures &popupFeatures, CefWindowInfo &windowInfo,

0 commit comments

Comments
 (0)