diff --git a/README.md b/README.md index 7bd395b7..26ad9200 100644 --- a/README.md +++ b/README.md @@ -3,15 +3,15 @@ CEF4Delphi is an open source project created by Salvador Díaz Fau to embed Chro CEF4Delphi is based on DCEF3 and fpCEF3. The original license of those projects still applies to CEF4Delphi. Read the license terms in the LICENSE.md file. -CEF4Delphi uses CEF 119.4.7 which includes Chromium 119.0.6045.199. +CEF4Delphi uses CEF 120.1.8 which includes Chromium 120.0.6099.109. The CEF binaries used by CEF4Delphi are available for download at Spotify : -* [Windows 32 bits](https://cef-builds.spotifycdn.com/cef_binary_119.4.7%2Bg55e15c8%2Bchromium-119.0.6045.199_windows32.tar.bz2) -* [Windows 64 bits](https://cef-builds.spotifycdn.com/cef_binary_119.4.7%2Bg55e15c8%2Bchromium-119.0.6045.199_windows64.tar.bz2) -* [Linux x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_119.4.7%2Bg55e15c8%2Bchromium-119.0.6045.199_linux64.tar.bz2) -* [Linux ARM 32 bits](https://cef-builds.spotifycdn.com/cef_binary_119.4.7%2Bg55e15c8%2Bchromium-119.0.6045.199_linuxarm.tar.bz2) -* [Linux ARM 64 bits](https://cef-builds.spotifycdn.com/cef_binary_119.4.7%2Bg55e15c8%2Bchromium-119.0.6045.199_linuxarm64.tar.bz2) -* [MacOS x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_119.4.7%2Bg55e15c8%2Bchromium-119.0.6045.199_macosx64.tar.bz2) +* [Windows 32 bits](https://cef-builds.spotifycdn.com/cef_binary_120.1.8%2Bge6b45b0%2Bchromium-120.0.6099.109_windows32.tar.bz2) +* [Windows 64 bits](https://cef-builds.spotifycdn.com/cef_binary_120.1.8%2Bge6b45b0%2Bchromium-120.0.6099.109_windows64.tar.bz2) +* [Linux x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_120.1.8%2Bge6b45b0%2Bchromium-120.0.6099.109_linux64.tar.bz2) +* [Linux ARM 32 bits](https://cef-builds.spotifycdn.com/cef_binary_120.1.8%2Bge6b45b0%2Bchromium-120.0.6099.109_linuxarm.tar.bz2) +* [Linux ARM 64 bits](https://cef-builds.spotifycdn.com/cef_binary_120.1.8%2Bge6b45b0%2Bchromium-120.0.6099.109_linuxarm64.tar.bz2) +* [MacOS x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_120.1.8%2Bge6b45b0%2Bchromium-120.0.6099.109_macosx64.tar.bz2) CEF4Delphi was developed and tested on Delphi 12.0 and it has been tested in Delphi 7, Delphi XE, Delphi 10, Delphi 11 and Lazarus 2.2.6/FPC 3.2.2. CEF4Delphi includes VCL, FireMonkey (FMX) and Lazarus components. diff --git a/demos/Delphi_FMX_Linux/FMXExternalPumpBrowser2/uFMXExternalPumpBrowser2.pas b/demos/Delphi_FMX_Linux/FMXExternalPumpBrowser2/uFMXExternalPumpBrowser2.pas index 2707b0a5..ee2929ee 100644 --- a/demos/Delphi_FMX_Linux/FMXExternalPumpBrowser2/uFMXExternalPumpBrowser2.pas +++ b/demos/Delphi_FMX_Linux/FMXExternalPumpBrowser2/uFMXExternalPumpBrowser2.pas @@ -494,7 +494,7 @@ procedure TFMXExternalPumpBrowserFrm.chrmosrBeforePopup( Sender var Result : Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TFMXExternalPumpBrowserFrm.chrmosrCursorChange( Sender : TObject; diff --git a/demos/Delphi_FMX_Mac/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas b/demos/Delphi_FMX_Mac/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas index cce8774d..8b07c501 100644 --- a/demos/Delphi_FMX_Mac/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas +++ b/demos/Delphi_FMX_Mac/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas @@ -641,7 +641,7 @@ procedure TFMXExternalPumpBrowserFrm.chrmosrBeforePopup( Sender var Result : Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TFMXExternalPumpBrowserFrm.chrmosrCursorChange( Sender : TObject; diff --git a/demos/Delphi_FMX_Windows/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas b/demos/Delphi_FMX_Windows/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas index 0b0f36d8..df511146 100644 --- a/demos/Delphi_FMX_Windows/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas +++ b/demos/Delphi_FMX_Windows/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas @@ -503,7 +503,7 @@ procedure TFMXExternalPumpBrowserFrm.chrmosrBeforePopup( Sender var Result : Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TFMXExternalPumpBrowserFrm.chrmosrCanFocus(Sender: TObject); diff --git a/demos/Delphi_FMX_Windows/FMXSkiaBrowser/uMainForm.pas b/demos/Delphi_FMX_Windows/FMXSkiaBrowser/uMainForm.pas index 564e3e96..0f550e8b 100644 --- a/demos/Delphi_FMX_Windows/FMXSkiaBrowser/uMainForm.pas +++ b/demos/Delphi_FMX_Windows/FMXSkiaBrowser/uMainForm.pas @@ -494,7 +494,7 @@ procedure TMainForm.chrmosrBeforePopup( Sender : TObject; var Result : Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TMainForm.chrmosrCanFocus(Sender: TObject); diff --git a/demos/Delphi_FMX_Windows/FMXTabbedBrowser/uBrowserFrame.pas b/demos/Delphi_FMX_Windows/FMXTabbedBrowser/uBrowserFrame.pas index 37ba171e..6c902116 100644 --- a/demos/Delphi_FMX_Windows/FMXTabbedBrowser/uBrowserFrame.pas +++ b/demos/Delphi_FMX_Windows/FMXTabbedBrowser/uBrowserFrame.pas @@ -213,7 +213,7 @@ procedure TBrowserFrame.FMXChromium1BeforePopup(Sender: TObject; var noJavascriptAccess, Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TBrowserFrame.FMXChromium1Close(Sender: TObject; @@ -277,7 +277,7 @@ procedure TBrowserFrame.FMXChromium1OpenUrlFromTab(Sender: TObject; out Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TBrowserFrame.FMXChromium1StatusMessage(Sender: TObject; diff --git a/demos/Delphi_FMX_Windows/FMXTabbedOSRBrowser/uBrowserFrame.pas b/demos/Delphi_FMX_Windows/FMXTabbedOSRBrowser/uBrowserFrame.pas index f4c06fee..9a346229 100644 --- a/demos/Delphi_FMX_Windows/FMXTabbedOSRBrowser/uBrowserFrame.pas +++ b/demos/Delphi_FMX_Windows/FMXTabbedOSRBrowser/uBrowserFrame.pas @@ -418,7 +418,7 @@ procedure TBrowserFrame.FMXChromium1BeforePopup(Sender: TObject; var noJavascriptAccess, Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TBrowserFrame.FMXChromium1CanFocus(Sender: TObject); @@ -526,7 +526,7 @@ procedure TBrowserFrame.FMXChromium1OpenUrlFromTab(Sender: TObject; out Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TBrowserFrame.FMXChromium1Paint(Sender: TObject; diff --git a/demos/Delphi_FMX_Windows/FMXToolBoxBrowser/uChildForm.pas b/demos/Delphi_FMX_Windows/FMXToolBoxBrowser/uChildForm.pas index f7d53be6..9dc06d13 100644 --- a/demos/Delphi_FMX_Windows/FMXToolBoxBrowser/uChildForm.pas +++ b/demos/Delphi_FMX_Windows/FMXToolBoxBrowser/uChildForm.pas @@ -259,7 +259,7 @@ procedure TChildForm.FMXChromium1BeforePopup(Sender: TObject; var noJavascriptAccess, Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TChildForm.FMXChromium1Close(Sender: TObject; const browser: ICefBrowser; var aAction : TCefCloseBrowserAction); diff --git a/demos/Delphi_FMX_Windows/FMXVirtualUIBrowser/uFMXVirtualUIBrowser.pas b/demos/Delphi_FMX_Windows/FMXVirtualUIBrowser/uFMXVirtualUIBrowser.pas index 62853e9d..bfdbeef7 100644 --- a/demos/Delphi_FMX_Windows/FMXVirtualUIBrowser/uFMXVirtualUIBrowser.pas +++ b/demos/Delphi_FMX_Windows/FMXVirtualUIBrowser/uFMXVirtualUIBrowser.pas @@ -517,7 +517,7 @@ procedure TMainForm.chrmosrBeforePopup( Sender : TObject; var Result : Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TMainForm.chrmosrCursorChange( Sender : TObject; diff --git a/demos/Delphi_FMX_Windows/SimpleFMXBrowser/uSimpleFMXBrowser.pas b/demos/Delphi_FMX_Windows/SimpleFMXBrowser/uSimpleFMXBrowser.pas index f9fed709..c5a6266d 100644 --- a/demos/Delphi_FMX_Windows/SimpleFMXBrowser/uSimpleFMXBrowser.pas +++ b/demos/Delphi_FMX_Windows/SimpleFMXBrowser/uSimpleFMXBrowser.pas @@ -180,7 +180,7 @@ procedure TSimpleFMXBrowserFrm.FMXChromium1BeforePopup( Sender var Result : boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TSimpleFMXBrowserFrm.FMXChromium1Close(Sender: TObject; const browser: ICefBrowser; var aAction : TCefCloseBrowserAction); diff --git a/demos/Delphi_VCL/ConsoleBrowser/uWebBrowser.pas b/demos/Delphi_VCL/ConsoleBrowser/uWebBrowser.pas index abaf1b7f..d5d6a80c 100644 --- a/demos/Delphi_VCL/ConsoleBrowser/uWebBrowser.pas +++ b/demos/Delphi_VCL/ConsoleBrowser/uWebBrowser.pas @@ -259,7 +259,7 @@ procedure TWebBrowserFrm.chrmosrBeforePopup( Sender : TObject; var Result : Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TWebBrowserFrm.chrmosrCursorChange( Sender : TObject; diff --git a/demos/Delphi_VCL/ConsoleBrowser2/uCEFBrowserThread.pas b/demos/Delphi_VCL/ConsoleBrowser2/uCEFBrowserThread.pas index fc531880..3175bdf2 100644 --- a/demos/Delphi_VCL/ConsoleBrowser2/uCEFBrowserThread.pas +++ b/demos/Delphi_VCL/ConsoleBrowser2/uCEFBrowserThread.pas @@ -499,7 +499,7 @@ end; procedure TCEFBrowserThread.Browser_OnBeforePopup(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const targetUrl, targetFrameName: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean; const popupFeatures: TCefPopupFeatures; var windowInfo: TCefWindowInfo; var client: ICefClient; var settings: TCefBrowserSettings; var extra_info: ICefDictionaryValue; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TCEFBrowserThread.Browser_OnBeforeClose(Sender: TObject; const browser: ICefBrowser); diff --git a/demos/Delphi_VCL/CookieVisitor/uCookieVisitor.pas b/demos/Delphi_VCL/CookieVisitor/uCookieVisitor.pas index 4a2ea0e0..1758542e 100644 --- a/demos/Delphi_VCL/CookieVisitor/uCookieVisitor.pas +++ b/demos/Delphi_VCL/CookieVisitor/uCookieVisitor.pas @@ -192,7 +192,7 @@ procedure TCookieVisitorFrm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TCookieVisitorFrm.Chromium1Close(Sender: TObject; diff --git a/demos/Delphi_VCL/CustomResourceBrowser/uMainForm.pas b/demos/Delphi_VCL/CustomResourceBrowser/uMainForm.pas index 4bee1ae4..7128e2a4 100644 --- a/demos/Delphi_VCL/CustomResourceBrowser/uMainForm.pas +++ b/demos/Delphi_VCL/CustomResourceBrowser/uMainForm.pas @@ -183,7 +183,7 @@ procedure TMainForm.Chromium_OnBeforePopup( Sender : TObject; var Result : Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TMainForm.WMMove(var aMessage : TWMMove); diff --git a/demos/Delphi_VCL/DLLBrowser/uWebBrowser.pas b/demos/Delphi_VCL/DLLBrowser/uWebBrowser.pas index a76aea36..c27ffd82 100644 --- a/demos/Delphi_VCL/DLLBrowser/uWebBrowser.pas +++ b/demos/Delphi_VCL/DLLBrowser/uWebBrowser.pas @@ -147,7 +147,7 @@ procedure TWebBrowserFrm.Chromium_OnBeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TWebBrowserFrm.WMMove(var aMessage : TWMMove); diff --git a/demos/Delphi_VCL/DOMVisitor/uDOMVisitor.pas b/demos/Delphi_VCL/DOMVisitor/uDOMVisitor.pas index 4f8df39a..6ddc0ba7 100644 --- a/demos/Delphi_VCL/DOMVisitor/uDOMVisitor.pas +++ b/demos/Delphi_VCL/DOMVisitor/uDOMVisitor.pas @@ -504,7 +504,7 @@ procedure TDOMVisitorFrm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TDOMVisitorFrm.Chromium1Close(Sender: TObject; diff --git a/demos/Delphi_VCL/Extensions/HelloWorldExt/uHelloWorldExt.pas b/demos/Delphi_VCL/Extensions/HelloWorldExt/uHelloWorldExt.pas index 6cbda7b0..bf33a284 100644 --- a/demos/Delphi_VCL/Extensions/HelloWorldExt/uHelloWorldExt.pas +++ b/demos/Delphi_VCL/Extensions/HelloWorldExt/uHelloWorldExt.pas @@ -197,7 +197,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess, Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1Close(Sender: TObject; @@ -213,7 +213,7 @@ procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; userGesture: Boolean; out Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.ExtensionChrBeforeClose(Sender: TObject; diff --git a/demos/Delphi_VCL/Extensions/PageColorExt/uPageColorExt.pas b/demos/Delphi_VCL/Extensions/PageColorExt/uPageColorExt.pas index 6cceec30..73d8135d 100644 --- a/demos/Delphi_VCL/Extensions/PageColorExt/uPageColorExt.pas +++ b/demos/Delphi_VCL/Extensions/PageColorExt/uPageColorExt.pas @@ -199,7 +199,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess, Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1Close(Sender: TObject; @@ -215,7 +215,7 @@ procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; userGesture: Boolean; out Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.ExtensionChrBeforeClose(Sender: TObject; diff --git a/demos/Delphi_VCL/ExternalPumpBrowser/uExternalPumpBrowser.pas b/demos/Delphi_VCL/ExternalPumpBrowser/uExternalPumpBrowser.pas index 4f5bddce..ff3f202a 100644 --- a/demos/Delphi_VCL/ExternalPumpBrowser/uExternalPumpBrowser.pas +++ b/demos/Delphi_VCL/ExternalPumpBrowser/uExternalPumpBrowser.pas @@ -138,7 +138,7 @@ procedure TExternalPumpBrowserFrm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TExternalPumpBrowserFrm.Chromium1Close(Sender: TObject; const browser: ICefBrowser; var aAction : TCefCloseBrowserAction); diff --git a/demos/Delphi_VCL/FullScreenBrowser/uMainForm.pas b/demos/Delphi_VCL/FullScreenBrowser/uMainForm.pas index d3c697dd..1bbe2fa0 100644 --- a/demos/Delphi_VCL/FullScreenBrowser/uMainForm.pas +++ b/demos/Delphi_VCL/FullScreenBrowser/uMainForm.pas @@ -137,7 +137,7 @@ procedure TMainForm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TMainForm.Chromium1Close(Sender: TObject; const browser: ICefBrowser; var aAction : TCefCloseBrowserAction); diff --git a/demos/Delphi_VCL/JavaScript/CustomTitleBar/uCustomTitleBarExtension.pas b/demos/Delphi_VCL/JavaScript/CustomTitleBar/uCustomTitleBarExtension.pas index e1485d5a..bb89d070 100644 --- a/demos/Delphi_VCL/JavaScript/CustomTitleBar/uCustomTitleBarExtension.pas +++ b/demos/Delphi_VCL/JavaScript/CustomTitleBar/uCustomTitleBarExtension.pas @@ -178,8 +178,7 @@ procedure TCTBForm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, - WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TCTBForm.executeJS(frame: ICefFrame); diff --git a/demos/Delphi_VCL/JavaScript/JSDialog/uJSDialogBrowser.pas b/demos/Delphi_VCL/JavaScript/JSDialog/uJSDialogBrowser.pas index 306721c8..a85c2634 100644 --- a/demos/Delphi_VCL/JavaScript/JSDialog/uJSDialogBrowser.pas +++ b/demos/Delphi_VCL/JavaScript/JSDialog/uJSDialogBrowser.pas @@ -239,7 +239,7 @@ procedure TJSDialogBrowserFrm.Chromium_OnBeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSDialogBrowserFrm.ShowJSDialogMsg(var aMessage: TMessage); diff --git a/demos/Delphi_VCL/JavaScript/JSEval/uJSEval.pas b/demos/Delphi_VCL/JavaScript/JSEval/uJSEval.pas index c3c8840d..cfa19404 100644 --- a/demos/Delphi_VCL/JavaScript/JSEval/uJSEval.pas +++ b/demos/Delphi_VCL/JavaScript/JSEval/uJSEval.pas @@ -163,7 +163,7 @@ procedure TJSEvalFrm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSEvalFrm.Chromium1Close(Sender: TObject; diff --git a/demos/Delphi_VCL/JavaScript/JSExecutingFunctions/uJSExecutingFunctions.pas b/demos/Delphi_VCL/JavaScript/JSExecutingFunctions/uJSExecutingFunctions.pas index 41d55853..d40a5825 100644 --- a/demos/Delphi_VCL/JavaScript/JSExecutingFunctions/uJSExecutingFunctions.pas +++ b/demos/Delphi_VCL/JavaScript/JSExecutingFunctions/uJSExecutingFunctions.pas @@ -165,7 +165,7 @@ procedure TJSExecutingFunctionsFrm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSExecutingFunctionsFrm.Chromium1Close(Sender: TObject; const browser: ICefBrowser; var aAction : TCefCloseBrowserAction); diff --git a/demos/Delphi_VCL/JavaScript/JSExtension/uJSExtension.pas b/demos/Delphi_VCL/JavaScript/JSExtension/uJSExtension.pas index 0aaaa8e5..cb7e83ba 100644 --- a/demos/Delphi_VCL/JavaScript/JSExtension/uJSExtension.pas +++ b/demos/Delphi_VCL/JavaScript/JSExtension/uJSExtension.pas @@ -313,7 +313,7 @@ procedure TJSExtensionFrm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSExtensionFrm.Chromium1Close(Sender: TObject; diff --git a/demos/Delphi_VCL/JavaScript/JSExtensionWithFunction/uJSExtensionWithFunction.pas b/demos/Delphi_VCL/JavaScript/JSExtensionWithFunction/uJSExtensionWithFunction.pas index fdc9d7e3..21a4978b 100644 --- a/demos/Delphi_VCL/JavaScript/JSExtensionWithFunction/uJSExtensionWithFunction.pas +++ b/demos/Delphi_VCL/JavaScript/JSExtensionWithFunction/uJSExtensionWithFunction.pas @@ -137,7 +137,7 @@ procedure TJSExtensionWithFunctionFrm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSExtensionWithFunctionFrm.Chromium1Close(Sender: TObject; diff --git a/demos/Delphi_VCL/JavaScript/JSExtensionWithObjectParameter/uJSExtensionWithObjectParameter.pas b/demos/Delphi_VCL/JavaScript/JSExtensionWithObjectParameter/uJSExtensionWithObjectParameter.pas index e103a34b..d0953595 100644 --- a/demos/Delphi_VCL/JavaScript/JSExtensionWithObjectParameter/uJSExtensionWithObjectParameter.pas +++ b/demos/Delphi_VCL/JavaScript/JSExtensionWithObjectParameter/uJSExtensionWithObjectParameter.pas @@ -142,7 +142,7 @@ procedure TJSExtensionWithObjectParameterFrm.Chromium1BeforePopup( var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSExtensionWithObjectParameterFrm.Chromium1Close( diff --git a/demos/Delphi_VCL/JavaScript/JSRTTIExtension/uJSRTTIExtension.pas b/demos/Delphi_VCL/JavaScript/JSRTTIExtension/uJSRTTIExtension.pas index d557e01c..e25edcb4 100644 --- a/demos/Delphi_VCL/JavaScript/JSRTTIExtension/uJSRTTIExtension.pas +++ b/demos/Delphi_VCL/JavaScript/JSRTTIExtension/uJSRTTIExtension.pas @@ -161,7 +161,7 @@ procedure TJSRTTIExtensionFrm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSRTTIExtensionFrm.Chromium1ContextMenuCommand(Sender: TObject; diff --git a/demos/Delphi_VCL/JavaScript/JSSharedMemoryProcMessage/uMainForm.pas b/demos/Delphi_VCL/JavaScript/JSSharedMemoryProcMessage/uMainForm.pas index fba1a62c..90327c65 100644 --- a/demos/Delphi_VCL/JavaScript/JSSharedMemoryProcMessage/uMainForm.pas +++ b/demos/Delphi_VCL/JavaScript/JSSharedMemoryProcMessage/uMainForm.pas @@ -195,7 +195,7 @@ procedure TMainForm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TMainForm.Chromium1Close(Sender: TObject; diff --git a/demos/Delphi_VCL/JavaScript/JSSimpleExtension/uJSSimpleExtension.pas b/demos/Delphi_VCL/JavaScript/JSSimpleExtension/uJSSimpleExtension.pas index 4c7214d2..e6f72683 100644 --- a/demos/Delphi_VCL/JavaScript/JSSimpleExtension/uJSSimpleExtension.pas +++ b/demos/Delphi_VCL/JavaScript/JSSimpleExtension/uJSSimpleExtension.pas @@ -122,7 +122,7 @@ procedure TJSSimpleExtensionFrm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSSimpleExtensionFrm.FormShow(Sender: TObject); diff --git a/demos/Delphi_VCL/JavaScript/JSSimpleWindowBinding/uJSSimpleWindowBinding.pas b/demos/Delphi_VCL/JavaScript/JSSimpleWindowBinding/uJSSimpleWindowBinding.pas index d59c76c6..98e469d3 100644 --- a/demos/Delphi_VCL/JavaScript/JSSimpleWindowBinding/uJSSimpleWindowBinding.pas +++ b/demos/Delphi_VCL/JavaScript/JSSimpleWindowBinding/uJSSimpleWindowBinding.pas @@ -110,7 +110,7 @@ procedure TJSSimpleWindowBindingFrm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSSimpleWindowBindingFrm.FormShow(Sender: TObject); diff --git a/demos/Delphi_VCL/JavaScript/JSWindowBindingSubProcess/uJSSimpleWindowBinding.pas b/demos/Delphi_VCL/JavaScript/JSWindowBindingSubProcess/uJSSimpleWindowBinding.pas index 3b665992..05123204 100644 --- a/demos/Delphi_VCL/JavaScript/JSWindowBindingSubProcess/uJSSimpleWindowBinding.pas +++ b/demos/Delphi_VCL/JavaScript/JSWindowBindingSubProcess/uJSSimpleWindowBinding.pas @@ -111,7 +111,7 @@ procedure TJSSimpleWindowBindingFrm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSSimpleWindowBindingFrm.FormShow(Sender: TObject); diff --git a/demos/Delphi_VCL/JavaScript/JSWindowBindingWithArrayBuffer/uJSWindowBindingWithArrayBuffer.pas b/demos/Delphi_VCL/JavaScript/JSWindowBindingWithArrayBuffer/uJSWindowBindingWithArrayBuffer.pas index 15e2fb60..17c5445e 100644 --- a/demos/Delphi_VCL/JavaScript/JSWindowBindingWithArrayBuffer/uJSWindowBindingWithArrayBuffer.pas +++ b/demos/Delphi_VCL/JavaScript/JSWindowBindingWithArrayBuffer/uJSWindowBindingWithArrayBuffer.pas @@ -135,7 +135,7 @@ procedure TJSWindowBindingWithArrayBufferFrm.Chromium1BeforePopup( var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSWindowBindingWithArrayBufferFrm.FormShow(Sender: TObject); diff --git a/demos/Delphi_VCL/JavaScript/JSWindowBindingWithFunction/uJSWindowBindingWithFunction.pas b/demos/Delphi_VCL/JavaScript/JSWindowBindingWithFunction/uJSWindowBindingWithFunction.pas index 4b12e022..be29a989 100644 --- a/demos/Delphi_VCL/JavaScript/JSWindowBindingWithFunction/uJSWindowBindingWithFunction.pas +++ b/demos/Delphi_VCL/JavaScript/JSWindowBindingWithFunction/uJSWindowBindingWithFunction.pas @@ -115,7 +115,7 @@ procedure TJSWindowBindingWithFunctionFrm.Chromium1BeforePopup( var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSWindowBindingWithFunctionFrm.FormShow(Sender: TObject); diff --git a/demos/Delphi_VCL/JavaScript/JSWindowBindingWithObject/uJSWindowBindingWithObject.pas b/demos/Delphi_VCL/JavaScript/JSWindowBindingWithObject/uJSWindowBindingWithObject.pas index d05f7a32..85a2bbea 100644 --- a/demos/Delphi_VCL/JavaScript/JSWindowBindingWithObject/uJSWindowBindingWithObject.pas +++ b/demos/Delphi_VCL/JavaScript/JSWindowBindingWithObject/uJSWindowBindingWithObject.pas @@ -116,7 +116,7 @@ procedure TJSWindowBindingWithObjectFrm.Chromium1BeforePopup( var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSWindowBindingWithObjectFrm.FormShow(Sender: TObject); diff --git a/demos/Delphi_VCL/KioskOSRBrowser/uKioskOSRBrowser.pas b/demos/Delphi_VCL/KioskOSRBrowser/uKioskOSRBrowser.pas index 124656eb..33ab0ebb 100644 --- a/demos/Delphi_VCL/KioskOSRBrowser/uKioskOSRBrowser.pas +++ b/demos/Delphi_VCL/KioskOSRBrowser/uKioskOSRBrowser.pas @@ -342,7 +342,7 @@ procedure TForm1.chrmosrBeforePopup( Sender : TObject; var Result : Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.chrmosrCursorChange( Sender : TObject; diff --git a/demos/Delphi_VCL/MDIBrowser/uChildForm.pas b/demos/Delphi_VCL/MDIBrowser/uChildForm.pas index 45e7655f..6c111763 100644 --- a/demos/Delphi_VCL/MDIBrowser/uChildForm.pas +++ b/demos/Delphi_VCL/MDIBrowser/uChildForm.pas @@ -96,7 +96,7 @@ procedure TChildForm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TChildForm.Chromium1Close(Sender: TObject; const browser: ICefBrowser; var aAction : TCefCloseBrowserAction); diff --git a/demos/Delphi_VCL/MDIExternalPumpBrowser/uChildForm.pas b/demos/Delphi_VCL/MDIExternalPumpBrowser/uChildForm.pas index eae863e7..34a36e19 100644 --- a/demos/Delphi_VCL/MDIExternalPumpBrowser/uChildForm.pas +++ b/demos/Delphi_VCL/MDIExternalPumpBrowser/uChildForm.pas @@ -97,7 +97,7 @@ procedure TChildForm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TChildForm.Chromium1Close(Sender: TObject; const browser: ICefBrowser; var aAction : TCefCloseBrowserAction); diff --git a/demos/Delphi_VCL/MobileBrowser/uMobileBrowser.pas b/demos/Delphi_VCL/MobileBrowser/uMobileBrowser.pas index 44a298a0..42498dcd 100644 --- a/demos/Delphi_VCL/MobileBrowser/uMobileBrowser.pas +++ b/demos/Delphi_VCL/MobileBrowser/uMobileBrowser.pas @@ -181,7 +181,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess, Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1Close(Sender: TObject; @@ -210,7 +210,7 @@ procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; userGesture: Boolean; out Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.ClearDeviceMetricsOverrideBtnClick(Sender: TObject); diff --git a/demos/Delphi_VCL/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.pas b/demos/Delphi_VCL/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.pas index 1ee790d6..c662e547 100644 --- a/demos/Delphi_VCL/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.pas +++ b/demos/Delphi_VCL/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.pas @@ -315,7 +315,7 @@ procedure TOSRExternalPumpBrowserFrm.chrmosrBeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TOSRExternalPumpBrowserFrm.chrmosrCanFocus(Sender: TObject); diff --git a/demos/Delphi_VCL/PopupBrowser/uChildForm.pas b/demos/Delphi_VCL/PopupBrowser/uChildForm.pas index 0c7f1338..d12b57f6 100644 --- a/demos/Delphi_VCL/PopupBrowser/uChildForm.pas +++ b/demos/Delphi_VCL/PopupBrowser/uChildForm.pas @@ -303,11 +303,11 @@ procedure TChildForm.Chromium1BeforePopup( Sender : TObject; var Result : Boolean); begin case targetDisposition of - WOD_NEW_FOREGROUND_TAB, - WOD_NEW_BACKGROUND_TAB, - WOD_NEW_WINDOW : Result := True; // For simplicity, this demo blocks new tabs and new windows. + CEF_WOD_NEW_FOREGROUND_TAB, + CEF_WOD_NEW_BACKGROUND_TAB, + CEF_WOD_NEW_WINDOW : Result := True; // For simplicity, this demo blocks new tabs and new windows. - WOD_NEW_POPUP : Result := not(TMainForm(Owner).CreateClientHandler(windowInfo, client, targetFrameName, popupFeatures)); + CEF_WOD_NEW_POPUP : Result := not(TMainForm(Owner).CreateClientHandler(windowInfo, client, targetFrameName, popupFeatures)); else Result := False; end; diff --git a/demos/Delphi_VCL/PopupBrowser/uMainForm.pas b/demos/Delphi_VCL/PopupBrowser/uMainForm.pas index 659225ce..bc82aeb0 100644 --- a/demos/Delphi_VCL/PopupBrowser/uMainForm.pas +++ b/demos/Delphi_VCL/PopupBrowser/uMainForm.pas @@ -194,11 +194,11 @@ procedure TMainForm.Chromium1BeforePopup( Sender : TObject; var Result : Boolean); begin case targetDisposition of - WOD_NEW_FOREGROUND_TAB, - WOD_NEW_BACKGROUND_TAB, - WOD_NEW_WINDOW : Result := True; // For simplicity, this demo blocks new tabs and new windows. + CEF_WOD_NEW_FOREGROUND_TAB, + CEF_WOD_NEW_BACKGROUND_TAB, + CEF_WOD_NEW_WINDOW : Result := True; // For simplicity, this demo blocks new tabs and new windows. - WOD_NEW_POPUP : Result := not(CreateClientHandler(windowInfo, client, targetFrameName, popupFeatures)); + CEF_WOD_NEW_POPUP : Result := not(CreateClientHandler(windowInfo, client, targetFrameName, popupFeatures)); else Result := False; end; diff --git a/demos/Delphi_VCL/PopupBrowser2/uChildForm.pas b/demos/Delphi_VCL/PopupBrowser2/uChildForm.pas index 59a8cfbe..b23185be 100644 --- a/demos/Delphi_VCL/PopupBrowser2/uChildForm.pas +++ b/demos/Delphi_VCL/PopupBrowser2/uChildForm.pas @@ -133,11 +133,11 @@ procedure TChildForm.Chromium1BeforePopup(Sender : TObject; var Result : Boolean); begin case targetDisposition of - WOD_NEW_FOREGROUND_TAB, - WOD_NEW_BACKGROUND_TAB, - WOD_NEW_WINDOW : Result := True; // For simplicity, this demo blocks new tabs and new windows. + CEF_WOD_NEW_FOREGROUND_TAB, + CEF_WOD_NEW_BACKGROUND_TAB, + CEF_WOD_NEW_WINDOW : Result := True; // For simplicity, this demo blocks new tabs and new windows. - WOD_NEW_POPUP : Result := not(TMainForm(Owner).CreateClientHandler(windowInfo, client, targetFrameName, popupFeatures)); + CEF_WOD_NEW_POPUP : Result := not(TMainForm(Owner).CreateClientHandler(windowInfo, client, targetFrameName, popupFeatures)); else Result := False; end; diff --git a/demos/Delphi_VCL/PopupBrowser2/uMainForm.pas b/demos/Delphi_VCL/PopupBrowser2/uMainForm.pas index 61d17367..eae94aa5 100644 --- a/demos/Delphi_VCL/PopupBrowser2/uMainForm.pas +++ b/demos/Delphi_VCL/PopupBrowser2/uMainForm.pas @@ -190,11 +190,11 @@ procedure TMainForm.Chromium1BeforePopup(Sender : TObject; var Result : Boolean); begin case targetDisposition of - WOD_NEW_FOREGROUND_TAB, - WOD_NEW_BACKGROUND_TAB, - WOD_NEW_WINDOW : Result := True; // For simplicity, this demo blocks new tabs and new windows. + CEF_WOD_NEW_FOREGROUND_TAB, + CEF_WOD_NEW_BACKGROUND_TAB, + CEF_WOD_NEW_WINDOW : Result := True; // For simplicity, this demo blocks new tabs and new windows. - WOD_NEW_POPUP : Result := not(CreateClientHandler(windowInfo, client, targetFrameName, popupFeatures)); + CEF_WOD_NEW_POPUP : Result := not(CreateClientHandler(windowInfo, client, targetFrameName, popupFeatures)); else Result := False; end; diff --git a/demos/Delphi_VCL/PostInspectorBrowser/uPostInspectorBrowser.pas b/demos/Delphi_VCL/PostInspectorBrowser/uPostInspectorBrowser.pas index 916776ef..bfdc8a9d 100644 --- a/demos/Delphi_VCL/PostInspectorBrowser/uPostInspectorBrowser.pas +++ b/demos/Delphi_VCL/PostInspectorBrowser/uPostInspectorBrowser.pas @@ -350,7 +350,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1Close(Sender: TObject; diff --git a/demos/Delphi_VCL/ResponseFilterBrowser/uResponseFilterBrowser.pas b/demos/Delphi_VCL/ResponseFilterBrowser/uResponseFilterBrowser.pas index 49c5cb49..9f51347e 100644 --- a/demos/Delphi_VCL/ResponseFilterBrowser/uResponseFilterBrowser.pas +++ b/demos/Delphi_VCL/ResponseFilterBrowser/uResponseFilterBrowser.pas @@ -475,7 +475,7 @@ procedure TResponseFilterBrowserFrm.Chromium1BeforePopup( Sender var Result : Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TResponseFilterBrowserFrm.Chromium1BeforeResourceLoad( Sender : TObject; diff --git a/demos/Delphi_VCL/SchemeRegistrationBrowser/uSchemeRegistrationBrowser.pas b/demos/Delphi_VCL/SchemeRegistrationBrowser/uSchemeRegistrationBrowser.pas index 35ca1915..100ddba8 100644 --- a/demos/Delphi_VCL/SchemeRegistrationBrowser/uSchemeRegistrationBrowser.pas +++ b/demos/Delphi_VCL/SchemeRegistrationBrowser/uSchemeRegistrationBrowser.pas @@ -138,7 +138,7 @@ procedure TSchemeRegistrationBrowserFrm.Chromium1BeforePopup( var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TSchemeRegistrationBrowserFrm.Chromium1Close(Sender: TObject; diff --git a/demos/Delphi_VCL/SimpleBrowser/uSimpleBrowser.pas b/demos/Delphi_VCL/SimpleBrowser/uSimpleBrowser.pas index 6e8d453a..15227003 100644 --- a/demos/Delphi_VCL/SimpleBrowser/uSimpleBrowser.pas +++ b/demos/Delphi_VCL/SimpleBrowser/uSimpleBrowser.pas @@ -142,7 +142,7 @@ procedure TForm1.Chromium_OnBeforePopup( Sender : TObject; var Result : Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.ChromiumWindow1AfterCreated(Sender: TObject); diff --git a/demos/Delphi_VCL/SimpleBrowser2/uSimpleBrowser2.pas b/demos/Delphi_VCL/SimpleBrowser2/uSimpleBrowser2.pas index e92f85c9..56d08f30 100644 --- a/demos/Delphi_VCL/SimpleBrowser2/uSimpleBrowser2.pas +++ b/demos/Delphi_VCL/SimpleBrowser2/uSimpleBrowser2.pas @@ -137,7 +137,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess, Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1Close(Sender: TObject; @@ -153,7 +153,7 @@ procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; userGesture: Boolean; out Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.BrowserCreatedMsg(var aMessage : TMessage); diff --git a/demos/Delphi_VCL/SimpleExternalPumpBrowser/uSimpleExternalPumpBrowser.pas b/demos/Delphi_VCL/SimpleExternalPumpBrowser/uSimpleExternalPumpBrowser.pas index eee9308b..50637a85 100644 --- a/demos/Delphi_VCL/SimpleExternalPumpBrowser/uSimpleExternalPumpBrowser.pas +++ b/demos/Delphi_VCL/SimpleExternalPumpBrowser/uSimpleExternalPumpBrowser.pas @@ -126,7 +126,7 @@ procedure TSimpleExternalPumpBrowserFrm.Chromium_OnBeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TSimpleExternalPumpBrowserFrm.ChromiumWindow1AfterCreated(Sender: TObject); diff --git a/demos/Delphi_VCL/SimpleOSRBrowser/uSimpleOSRBrowser.pas b/demos/Delphi_VCL/SimpleOSRBrowser/uSimpleOSRBrowser.pas index 3060b45e..7a7cffeb 100644 --- a/demos/Delphi_VCL/SimpleOSRBrowser/uSimpleOSRBrowser.pas +++ b/demos/Delphi_VCL/SimpleOSRBrowser/uSimpleOSRBrowser.pas @@ -385,7 +385,7 @@ procedure TForm1.chrmosrBeforePopup( Sender : TObject; var Result : Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.chrmosrCanFocus(Sender: TObject); diff --git a/demos/Delphi_VCL/SubProcess/uSimpleBrowser.pas b/demos/Delphi_VCL/SubProcess/uSimpleBrowser.pas index 9560ff7d..92e679d5 100644 --- a/demos/Delphi_VCL/SubProcess/uSimpleBrowser.pas +++ b/demos/Delphi_VCL/SubProcess/uSimpleBrowser.pas @@ -126,7 +126,7 @@ procedure TForm1.Chromium_OnBeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.ChromiumWindow1AfterCreated(Sender: TObject); diff --git a/demos/Delphi_VCL/TabbedBrowser/uMainForm.pas b/demos/Delphi_VCL/TabbedBrowser/uMainForm.pas index c65332d6..5a87ce61 100644 --- a/demos/Delphi_VCL/TabbedBrowser/uMainForm.pas +++ b/demos/Delphi_VCL/TabbedBrowser/uMainForm.pas @@ -409,7 +409,7 @@ procedure TMainForm.Chromium_OnBeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; function TMainForm.SearchChromium(aPageIndex : integer; var aChromium : TChromium) : boolean; diff --git a/demos/Delphi_VCL/TabbedBrowser2/uMainForm.pas b/demos/Delphi_VCL/TabbedBrowser2/uMainForm.pas index e1406eda..b6262f96 100644 --- a/demos/Delphi_VCL/TabbedBrowser2/uMainForm.pas +++ b/demos/Delphi_VCL/TabbedBrowser2/uMainForm.pas @@ -502,14 +502,14 @@ begin FCriticalSection.Acquire; case targetDisposition of - WOD_NEW_FOREGROUND_TAB, - WOD_NEW_BACKGROUND_TAB : + CEF_WOD_NEW_FOREGROUND_TAB, + CEF_WOD_NEW_BACKGROUND_TAB : Result := (FHiddenTab <> nil) and FHiddenTab.CreateClientHandler(windowInfo, client, targetFrameName, popupFeatures) and PostMessage(Handle, CEF_CREATENEXTTAB, 0, ord(False)); - WOD_NEW_WINDOW, - WOD_NEW_POPUP : + CEF_WOD_NEW_WINDOW, + CEF_WOD_NEW_POPUP : Result := (FChildForm <> nil) and FChildForm.CreateClientHandler(windowInfo, client, targetFrameName, popupFeatures) and PostMessage(Handle, CEF_CREATENEXTCHILD, 0, ord(False)); @@ -531,15 +531,15 @@ begin FCriticalSection.Acquire; case targetDisposition of - WOD_NEW_FOREGROUND_TAB, - WOD_NEW_BACKGROUND_TAB : + CEF_WOD_NEW_FOREGROUND_TAB, + CEF_WOD_NEW_BACKGROUND_TAB : begin FPendingURL := targetUrl; Result := PostMessage(Handle, CEF_CREATENEXTTAB, 0, ord(True)); end; - WOD_NEW_WINDOW, - WOD_NEW_POPUP : + CEF_WOD_NEW_WINDOW, + CEF_WOD_NEW_POPUP : begin FPendingURL := targetUrl; Result := PostMessage(Handle, CEF_CREATENEXTCHILD, 0, ord(True)); diff --git a/demos/Delphi_VCL/TabbedOSRBrowser/uMainForm.pas b/demos/Delphi_VCL/TabbedOSRBrowser/uMainForm.pas index a8aeb61e..516fe04c 100644 --- a/demos/Delphi_VCL/TabbedOSRBrowser/uMainForm.pas +++ b/demos/Delphi_VCL/TabbedOSRBrowser/uMainForm.pas @@ -584,14 +584,14 @@ begin FCriticalSection.Acquire; case targetDisposition of - WOD_NEW_FOREGROUND_TAB, - WOD_NEW_BACKGROUND_TAB : + CEF_WOD_NEW_FOREGROUND_TAB, + CEF_WOD_NEW_BACKGROUND_TAB : Result := (FHiddenTab <> nil) and FHiddenTab.CreateClientHandler(windowInfo, client, targetFrameName, popupFeatures) and PostMessage(Handle, CEF_CREATENEXTTAB, 0, ord(False)); - WOD_NEW_WINDOW, - WOD_NEW_POPUP : + CEF_WOD_NEW_WINDOW, + CEF_WOD_NEW_POPUP : Result := (FChildForm <> nil) and FChildForm.CreateClientHandler(windowInfo, client, targetFrameName, popupFeatures) and PostMessage(Handle, CEF_CREATENEXTCHILD, 0, ord(False)); @@ -610,15 +610,15 @@ begin FCriticalSection.Acquire; case targetDisposition of - WOD_NEW_FOREGROUND_TAB, - WOD_NEW_BACKGROUND_TAB : + CEF_WOD_NEW_FOREGROUND_TAB, + CEF_WOD_NEW_BACKGROUND_TAB : begin FPendingURL := targetUrl; Result := PostMessage(Handle, CEF_CREATENEXTTAB, 0, ord(True)); end; - WOD_NEW_WINDOW, - WOD_NEW_POPUP : + CEF_WOD_NEW_WINDOW, + CEF_WOD_NEW_POPUP : begin FPendingURL := targetUrl; Result := PostMessage(Handle, CEF_CREATENEXTCHILD, 0, ord(True)); diff --git a/demos/Delphi_VCL/TinyBrowser/uTinyBrowser.pas b/demos/Delphi_VCL/TinyBrowser/uTinyBrowser.pas index eef6ea97..95a61523 100644 --- a/demos/Delphi_VCL/TinyBrowser/uTinyBrowser.pas +++ b/demos/Delphi_VCL/TinyBrowser/uTinyBrowser.pas @@ -161,7 +161,7 @@ procedure TTinyBrowser.Chromium_OnBeforePopup( Sender : TObject var Result : Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TTinyBrowser.Chromium_OnOpenUrlFromTab( Sender : TObject; @@ -173,7 +173,7 @@ procedure TTinyBrowser.Chromium_OnOpenUrlFromTab( Sender : TObje out Result : Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TTinyBrowser.Chromium_OnTitleChange( Sender : TObject; diff --git a/demos/Delphi_VCL/TinyBrowser2/uTinyBrowser2.pas b/demos/Delphi_VCL/TinyBrowser2/uTinyBrowser2.pas index 1e827e87..2b129825 100644 --- a/demos/Delphi_VCL/TinyBrowser2/uTinyBrowser2.pas +++ b/demos/Delphi_VCL/TinyBrowser2/uTinyBrowser2.pas @@ -144,7 +144,7 @@ procedure TTinyBrowser2.Chromium_OnBeforePopup(Sender: TObject; const browser: I var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TTinyBrowser2.Chromium_OnOpenUrlFromTab(Sender: TObject; @@ -153,7 +153,7 @@ procedure TTinyBrowser2.Chromium_OnOpenUrlFromTab(Sender: TObject; userGesture: Boolean; out Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; end. diff --git a/demos/Delphi_VCL/ToolBoxBrowser/uChildForm.pas b/demos/Delphi_VCL/ToolBoxBrowser/uChildForm.pas index 46a4f5a2..af5fba8a 100644 --- a/demos/Delphi_VCL/ToolBoxBrowser/uChildForm.pas +++ b/demos/Delphi_VCL/ToolBoxBrowser/uChildForm.pas @@ -90,7 +90,7 @@ procedure TChildForm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TChildForm.Chromium1Close(Sender: TObject; const browser: ICefBrowser; var aAction : TCefCloseBrowserAction); diff --git a/demos/Delphi_VCL/ToolBoxBrowser2/uMainForm.pas b/demos/Delphi_VCL/ToolBoxBrowser2/uMainForm.pas index ff88fb67..220720a7 100644 --- a/demos/Delphi_VCL/ToolBoxBrowser2/uMainForm.pas +++ b/demos/Delphi_VCL/ToolBoxBrowser2/uMainForm.pas @@ -195,7 +195,7 @@ procedure TMainForm.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess, Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TMainForm.Chromium1TitleChange(Sender: TObject; diff --git a/demos/Delphi_VCL/ToolBoxSubProcessBrowser/uChildForm.pas b/demos/Delphi_VCL/ToolBoxSubProcessBrowser/uChildForm.pas index 6c6203be..29b68b32 100644 --- a/demos/Delphi_VCL/ToolBoxSubProcessBrowser/uChildForm.pas +++ b/demos/Delphi_VCL/ToolBoxSubProcessBrowser/uChildForm.pas @@ -90,7 +90,7 @@ procedure TChildForm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TChildForm.Chromium1Close(Sender: TObject; const browser: ICefBrowser; var aAction : TCefCloseBrowserAction); diff --git a/demos/Delphi_VCL/VirtualUIBrowser/uVirtualUIBrowser.pas b/demos/Delphi_VCL/VirtualUIBrowser/uVirtualUIBrowser.pas index b3de972e..02ae06c4 100644 --- a/demos/Delphi_VCL/VirtualUIBrowser/uVirtualUIBrowser.pas +++ b/demos/Delphi_VCL/VirtualUIBrowser/uVirtualUIBrowser.pas @@ -324,7 +324,7 @@ procedure TForm1.chrmosrBeforePopup( Sender : TObject; var Result : Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.chrmosrCursorChange( Sender : TObject; diff --git a/demos/Delphi_VCL/WebpageSnapshot/uCEFBrowserThread.pas b/demos/Delphi_VCL/WebpageSnapshot/uCEFBrowserThread.pas index 840bc451..b670a5ad 100644 --- a/demos/Delphi_VCL/WebpageSnapshot/uCEFBrowserThread.pas +++ b/demos/Delphi_VCL/WebpageSnapshot/uCEFBrowserThread.pas @@ -533,7 +533,7 @@ end; procedure TCEFBrowserThread.Browser_OnBeforePopup(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const targetUrl, targetFrameName: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean; const popupFeatures: TCefPopupFeatures; var windowInfo: TCefWindowInfo; var client: ICefClient; var settings: TCefBrowserSettings; var extra_info: ICefDictionaryValue; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TCEFBrowserThread.Browser_OnBeforeClose(Sender: TObject; const browser: ICefBrowser); diff --git a/demos/Delphi_VCL/WindowsServiceBrowser/uCEFBrowserThread.pas b/demos/Delphi_VCL/WindowsServiceBrowser/uCEFBrowserThread.pas index fc531880..3175bdf2 100644 --- a/demos/Delphi_VCL/WindowsServiceBrowser/uCEFBrowserThread.pas +++ b/demos/Delphi_VCL/WindowsServiceBrowser/uCEFBrowserThread.pas @@ -499,7 +499,7 @@ end; procedure TCEFBrowserThread.Browser_OnBeforePopup(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const targetUrl, targetFrameName: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean; const popupFeatures: TCefPopupFeatures; var windowInfo: TCefWindowInfo; var client: ICefClient; var settings: TCefBrowserSettings; var extra_info: ICefDictionaryValue; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TCEFBrowserThread.Browser_OnBeforeClose(Sender: TObject; const browser: ICefBrowser); diff --git a/demos/Lazarus_Linux_GTK2/ExternalPumpBrowser/uExternalPumpBrowser.pas b/demos/Lazarus_Linux_GTK2/ExternalPumpBrowser/uExternalPumpBrowser.pas index f60bf6d8..61f688b6 100644 --- a/demos/Lazarus_Linux_GTK2/ExternalPumpBrowser/uExternalPumpBrowser.pas +++ b/demos/Lazarus_Linux_GTK2/ExternalPumpBrowser/uExternalPumpBrowser.pas @@ -161,7 +161,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; @@ -170,7 +170,7 @@ procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.FormActivate(Sender: TObject); diff --git a/demos/Lazarus_Linux_GTK2/MobileBrowser/uMobileBrowser.pas b/demos/Lazarus_Linux_GTK2/MobileBrowser/uMobileBrowser.pas index d5c81354..afc403cc 100644 --- a/demos/Lazarus_Linux_GTK2/MobileBrowser/uMobileBrowser.pas +++ b/demos/Lazarus_Linux_GTK2/MobileBrowser/uMobileBrowser.pas @@ -197,7 +197,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; @@ -206,7 +206,7 @@ procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.FormActivate(Sender: TObject); diff --git a/demos/Lazarus_Linux_GTK2/OSRExternalPumpBrowser/uosrexternalpumpbrowser.pas b/demos/Lazarus_Linux_GTK2/OSRExternalPumpBrowser/uosrexternalpumpbrowser.pas index a91738d7..ac115d1c 100644 --- a/demos/Lazarus_Linux_GTK2/OSRExternalPumpBrowser/uosrexternalpumpbrowser.pas +++ b/demos/Lazarus_Linux_GTK2/OSRExternalPumpBrowser/uosrexternalpumpbrowser.pas @@ -415,7 +415,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1CursorChange(Sender: TObject; @@ -484,7 +484,7 @@ procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1Paint(Sender: TObject; const browser: ICefBrowser; diff --git a/demos/Lazarus_Linux_GTK2/OSRExternalPumpBrowser2/uosrexternalpumpbrowser2.pas b/demos/Lazarus_Linux_GTK2/OSRExternalPumpBrowser2/uosrexternalpumpbrowser2.pas index 94f8824d..82084744 100644 --- a/demos/Lazarus_Linux_GTK2/OSRExternalPumpBrowser2/uosrexternalpumpbrowser2.pas +++ b/demos/Lazarus_Linux_GTK2/OSRExternalPumpBrowser2/uosrexternalpumpbrowser2.pas @@ -478,7 +478,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1CursorChange(Sender: TObject; @@ -547,7 +547,7 @@ procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1Paint(Sender: TObject; const browser: ICefBrowser; diff --git a/demos/Lazarus_Linux_GTK2/SimpleBrowser/usimplebrowser.pas b/demos/Lazarus_Linux_GTK2/SimpleBrowser/usimplebrowser.pas index 9c040daf..f5c3c3d1 100644 --- a/demos/Lazarus_Linux_GTK2/SimpleBrowser/usimplebrowser.pas +++ b/demos/Lazarus_Linux_GTK2/SimpleBrowser/usimplebrowser.pas @@ -111,7 +111,7 @@ procedure TForm1.Chromium_OnBeforePopup(Sender: TObject; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.ChromiumWindow1AfterCreated(Sender: TObject); diff --git a/demos/Lazarus_Linux_GTK2/SimpleBrowser2/usimplebrowser2.pas b/demos/Lazarus_Linux_GTK2/SimpleBrowser2/usimplebrowser2.pas index cfe91c12..2a009ff3 100644 --- a/demos/Lazarus_Linux_GTK2/SimpleBrowser2/usimplebrowser2.pas +++ b/demos/Lazarus_Linux_GTK2/SimpleBrowser2/usimplebrowser2.pas @@ -152,7 +152,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; @@ -161,7 +161,7 @@ procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.FormActivate(Sender: TObject); diff --git a/demos/Lazarus_Linux_GTK2/SimpleOSRBrowser/usimpleosrbrowser.pas b/demos/Lazarus_Linux_GTK2/SimpleOSRBrowser/usimpleosrbrowser.pas index f80b7fb9..e4e853eb 100644 --- a/demos/Lazarus_Linux_GTK2/SimpleOSRBrowser/usimpleosrbrowser.pas +++ b/demos/Lazarus_Linux_GTK2/SimpleOSRBrowser/usimpleosrbrowser.pas @@ -426,7 +426,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1CursorChange(Sender: TObject; @@ -499,7 +499,7 @@ procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1Paint(Sender: TObject; const browser: ICefBrowser; diff --git a/demos/Lazarus_Linux_GTK2/SubProcess/uSubProcess.pas b/demos/Lazarus_Linux_GTK2/SubProcess/uSubProcess.pas index dff95ba6..c0e98f51 100644 --- a/demos/Lazarus_Linux_GTK2/SubProcess/uSubProcess.pas +++ b/demos/Lazarus_Linux_GTK2/SubProcess/uSubProcess.pas @@ -133,7 +133,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; @@ -142,7 +142,7 @@ procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.FormActivate(Sender: TObject); diff --git a/demos/Lazarus_Linux_GTK2/TabbedBrowser2/uBrowserFrame.pas b/demos/Lazarus_Linux_GTK2/TabbedBrowser2/uBrowserFrame.pas index 3365d080..2dc44852 100644 --- a/demos/Lazarus_Linux_GTK2/TabbedBrowser2/uBrowserFrame.pas +++ b/demos/Lazarus_Linux_GTK2/TabbedBrowser2/uBrowserFrame.pas @@ -329,7 +329,7 @@ procedure TBrowserFrame.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess, Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TBrowserFrame.Chromium1Close(Sender: TObject; @@ -375,7 +375,7 @@ procedure TBrowserFrame.Chromium1OpenUrlFromTab(Sender: TObject; out Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TBrowserFrame.Chromium1StatusMessage(Sender: TObject; diff --git a/demos/Lazarus_Linux_GTK2/TinyBrowser/uTinyBrowser.pas b/demos/Lazarus_Linux_GTK2/TinyBrowser/uTinyBrowser.pas index c4d6f051..4281bac5 100644 --- a/demos/Lazarus_Linux_GTK2/TinyBrowser/uTinyBrowser.pas +++ b/demos/Lazarus_Linux_GTK2/TinyBrowser/uTinyBrowser.pas @@ -163,7 +163,7 @@ procedure TTinyBrowser.Chromium_OnBeforePopup( Sender : TObject var Result : Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TTinyBrowser.Chromium_OnTitleChange( Sender : TObject; diff --git a/demos/Lazarus_Linux_GTK2/TinyBrowser2/uTinyBrowser2.pas b/demos/Lazarus_Linux_GTK2/TinyBrowser2/uTinyBrowser2.pas index d5c233bb..c061dc5d 100644 --- a/demos/Lazarus_Linux_GTK2/TinyBrowser2/uTinyBrowser2.pas +++ b/demos/Lazarus_Linux_GTK2/TinyBrowser2/uTinyBrowser2.pas @@ -168,7 +168,7 @@ procedure TTinyBrowser2.Chromium_OnBeforePopup(Sender: TObject; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TTinyBrowser2.Chromium_OnOpenUrlFromTab(Sender: TObject; @@ -177,7 +177,7 @@ procedure TTinyBrowser2.Chromium_OnOpenUrlFromTab(Sender: TObject; userGesture: Boolean; out Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; end. diff --git a/demos/Lazarus_Linux_GTK3/OSRExternalPumpBrowser/uosrexternalpumpbrowser.pas b/demos/Lazarus_Linux_GTK3/OSRExternalPumpBrowser/uosrexternalpumpbrowser.pas index a4d37cb7..8232dff9 100644 --- a/demos/Lazarus_Linux_GTK3/OSRExternalPumpBrowser/uosrexternalpumpbrowser.pas +++ b/demos/Lazarus_Linux_GTK3/OSRExternalPumpBrowser/uosrexternalpumpbrowser.pas @@ -422,7 +422,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1CursorChange(Sender: TObject; @@ -491,7 +491,7 @@ procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1Paint(Sender: TObject; const browser: ICefBrowser; diff --git a/demos/Lazarus_Linux_GTK3/TinyBrowser/uTinyBrowser.pas b/demos/Lazarus_Linux_GTK3/TinyBrowser/uTinyBrowser.pas index d6377ae3..e1c80940 100644 --- a/demos/Lazarus_Linux_GTK3/TinyBrowser/uTinyBrowser.pas +++ b/demos/Lazarus_Linux_GTK3/TinyBrowser/uTinyBrowser.pas @@ -157,7 +157,7 @@ procedure TTinyBrowser.Chromium_OnBeforePopup( Sender : TObject var Result : Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TTinyBrowser.Chromium_OnTitleChange( Sender : TObject; diff --git a/demos/Lazarus_Linux_GTK3/TinyBrowser2/uTinyBrowser2.pas b/demos/Lazarus_Linux_GTK3/TinyBrowser2/uTinyBrowser2.pas index 71128ed3..011aeb01 100644 --- a/demos/Lazarus_Linux_GTK3/TinyBrowser2/uTinyBrowser2.pas +++ b/demos/Lazarus_Linux_GTK3/TinyBrowser2/uTinyBrowser2.pas @@ -162,7 +162,7 @@ procedure TTinyBrowser2.Chromium_OnBeforePopup(Sender: TObject; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TTinyBrowser2.Chromium_OnOpenUrlFromTab(Sender: TObject; @@ -171,7 +171,7 @@ procedure TTinyBrowser2.Chromium_OnOpenUrlFromTab(Sender: TObject; userGesture: Boolean; out Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; end. diff --git a/demos/Lazarus_Mac/ExternalPumpBrowser/uExternalPumpBrowser.pas b/demos/Lazarus_Mac/ExternalPumpBrowser/uExternalPumpBrowser.pas index dbfc0c97..1ffa0dfb 100644 --- a/demos/Lazarus_Mac/ExternalPumpBrowser/uExternalPumpBrowser.pas +++ b/demos/Lazarus_Mac/ExternalPumpBrowser/uExternalPumpBrowser.pas @@ -138,7 +138,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; @@ -147,7 +147,7 @@ procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.FormActivate(Sender: TObject); diff --git a/demos/Lazarus_Windows/ConsoleBrowser2/uCEFBrowserThread.pas b/demos/Lazarus_Windows/ConsoleBrowser2/uCEFBrowserThread.pas index 0061123e..2f08c4ba 100644 --- a/demos/Lazarus_Windows/ConsoleBrowser2/uCEFBrowserThread.pas +++ b/demos/Lazarus_Windows/ConsoleBrowser2/uCEFBrowserThread.pas @@ -521,7 +521,7 @@ end; procedure TCEFBrowserThread.Browser_OnBeforePopup(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const targetUrl, targetFrameName: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean; const popupFeatures: TCefPopupFeatures; var windowInfo: TCefWindowInfo; var client: ICefClient; var settings: TCefBrowserSettings; var extra_info: ICefDictionaryValue; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TCEFBrowserThread.Browser_OnBeforeClose(Sender: TObject; const browser: ICefBrowser); diff --git a/demos/Lazarus_Windows/CookieVisitor/uCookieVisitor.pas b/demos/Lazarus_Windows/CookieVisitor/uCookieVisitor.pas index 7ab68cd4..83eef928 100644 --- a/demos/Lazarus_Windows/CookieVisitor/uCookieVisitor.pas +++ b/demos/Lazarus_Windows/CookieVisitor/uCookieVisitor.pas @@ -240,7 +240,7 @@ procedure TCookieVisitorFrm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TCookieVisitorFrm.Chromium1Close(Sender: TObject; diff --git a/demos/Lazarus_Windows/CustomResourceBrowser/uMainForm.pas b/demos/Lazarus_Windows/CustomResourceBrowser/uMainForm.pas index d0dbbaf9..0a20e16f 100644 --- a/demos/Lazarus_Windows/CustomResourceBrowser/uMainForm.pas +++ b/demos/Lazarus_Windows/CustomResourceBrowser/uMainForm.pas @@ -177,7 +177,7 @@ procedure TMainForm.Chromium_OnBeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TMainForm.WMMove(var aMessage : TWMMove); diff --git a/demos/Lazarus_Windows/DOMVisitor/uDOMVisitor.pas b/demos/Lazarus_Windows/DOMVisitor/uDOMVisitor.pas index 3a2f9786..fd0ffc13 100644 --- a/demos/Lazarus_Windows/DOMVisitor/uDOMVisitor.pas +++ b/demos/Lazarus_Windows/DOMVisitor/uDOMVisitor.pas @@ -490,7 +490,7 @@ procedure TDOMVisitorFrm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TDOMVisitorFrm.Chromium1Close(Sender: TObject; diff --git a/demos/Lazarus_Windows/ExternalPumpBrowser/uExternalPumpBrowser.pas b/demos/Lazarus_Windows/ExternalPumpBrowser/uExternalPumpBrowser.pas index 24b5fae5..6234b982 100644 --- a/demos/Lazarus_Windows/ExternalPumpBrowser/uExternalPumpBrowser.pas +++ b/demos/Lazarus_Windows/ExternalPumpBrowser/uExternalPumpBrowser.pas @@ -152,7 +152,7 @@ procedure TExternalPumpBrowserFrm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TExternalPumpBrowserFrm.Chromium1Close(Sender: TObject; const browser: ICefBrowser; var aAction : TCefCloseBrowserAction); diff --git a/demos/Lazarus_Windows/FullScreenBrowser/uMainForm.pas b/demos/Lazarus_Windows/FullScreenBrowser/uMainForm.pas index 3b4df95c..a8553f25 100644 --- a/demos/Lazarus_Windows/FullScreenBrowser/uMainForm.pas +++ b/demos/Lazarus_Windows/FullScreenBrowser/uMainForm.pas @@ -155,7 +155,7 @@ procedure TMainForm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TMainForm.Chromium1Close(Sender: TObject; const browser: ICefBrowser; var aAction : TCefCloseBrowserAction); diff --git a/demos/Lazarus_Windows/JavaScript/JSDialog/uJSDialogBrowser.pas b/demos/Lazarus_Windows/JavaScript/JSDialog/uJSDialogBrowser.pas index dae14bc3..621a50c9 100644 --- a/demos/Lazarus_Windows/JavaScript/JSDialog/uJSDialogBrowser.pas +++ b/demos/Lazarus_Windows/JavaScript/JSDialog/uJSDialogBrowser.pas @@ -246,7 +246,7 @@ procedure TJSDialogBrowserFrm.Chromium_OnBeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSDialogBrowserFrm.ShowJSDialogMsg(var aMessage: TMessage); diff --git a/demos/Lazarus_Windows/JavaScript/JSEval/uJSEval.pas b/demos/Lazarus_Windows/JavaScript/JSEval/uJSEval.pas index 63094495..45760178 100644 --- a/demos/Lazarus_Windows/JavaScript/JSEval/uJSEval.pas +++ b/demos/Lazarus_Windows/JavaScript/JSEval/uJSEval.pas @@ -183,7 +183,7 @@ procedure TJSEvalFrm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSEvalFrm.Chromium1Close(Sender: TObject; diff --git a/demos/Lazarus_Windows/JavaScript/JSExecutingFunctions/uJSExecutingFunctions.pas b/demos/Lazarus_Windows/JavaScript/JSExecutingFunctions/uJSExecutingFunctions.pas index 84f32372..5c16e139 100644 --- a/demos/Lazarus_Windows/JavaScript/JSExecutingFunctions/uJSExecutingFunctions.pas +++ b/demos/Lazarus_Windows/JavaScript/JSExecutingFunctions/uJSExecutingFunctions.pas @@ -182,7 +182,7 @@ procedure TJSExecutingFunctionsFrm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSExecutingFunctionsFrm.Chromium1Close(Sender: TObject; const browser: ICefBrowser; var aAction : TCefCloseBrowserAction); diff --git a/demos/Lazarus_Windows/JavaScript/JSExtension/uJSExtension.pas b/demos/Lazarus_Windows/JavaScript/JSExtension/uJSExtension.pas index cc0ce31d..ac784cb8 100644 --- a/demos/Lazarus_Windows/JavaScript/JSExtension/uJSExtension.pas +++ b/demos/Lazarus_Windows/JavaScript/JSExtension/uJSExtension.pas @@ -335,7 +335,7 @@ procedure TJSExtensionFrm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSExtensionFrm.Chromium1Close(Sender: TObject; diff --git a/demos/Lazarus_Windows/JavaScript/JSExtensionWithFunction/uJSExtensionWithFunction.pas b/demos/Lazarus_Windows/JavaScript/JSExtensionWithFunction/uJSExtensionWithFunction.pas index b99aa8b3..b575ee25 100644 --- a/demos/Lazarus_Windows/JavaScript/JSExtensionWithFunction/uJSExtensionWithFunction.pas +++ b/demos/Lazarus_Windows/JavaScript/JSExtensionWithFunction/uJSExtensionWithFunction.pas @@ -147,7 +147,7 @@ procedure TJSExtensionWithFunctionFrm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSExtensionWithFunctionFrm.Chromium1Close(Sender: TObject; diff --git a/demos/Lazarus_Windows/JavaScript/JSExtensionWithObjectParameter/uJSExtensionWithObjectParameter.pas b/demos/Lazarus_Windows/JavaScript/JSExtensionWithObjectParameter/uJSExtensionWithObjectParameter.pas index ebb8845d..40b3c697 100644 --- a/demos/Lazarus_Windows/JavaScript/JSExtensionWithObjectParameter/uJSExtensionWithObjectParameter.pas +++ b/demos/Lazarus_Windows/JavaScript/JSExtensionWithObjectParameter/uJSExtensionWithObjectParameter.pas @@ -149,7 +149,7 @@ procedure TJSExtensionWithObjectParameterFrm.Chromium1BeforePopup( var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSExtensionWithObjectParameterFrm.Chromium1Close( diff --git a/demos/Lazarus_Windows/JavaScript/JSSharedMemoryProcMessage/uMainForm.pas b/demos/Lazarus_Windows/JavaScript/JSSharedMemoryProcMessage/uMainForm.pas index 226234d7..63ea3e93 100644 --- a/demos/Lazarus_Windows/JavaScript/JSSharedMemoryProcMessage/uMainForm.pas +++ b/demos/Lazarus_Windows/JavaScript/JSSharedMemoryProcMessage/uMainForm.pas @@ -190,7 +190,7 @@ procedure TMainForm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TMainForm.Chromium1Close(Sender: TObject; diff --git a/demos/Lazarus_Windows/JavaScript/JSSimpleExtension/uJSSimpleExtension.pas b/demos/Lazarus_Windows/JavaScript/JSSimpleExtension/uJSSimpleExtension.pas index 75677474..a21c0311 100644 --- a/demos/Lazarus_Windows/JavaScript/JSSimpleExtension/uJSSimpleExtension.pas +++ b/demos/Lazarus_Windows/JavaScript/JSSimpleExtension/uJSSimpleExtension.pas @@ -130,7 +130,7 @@ procedure TJSSimpleExtensionFrm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSSimpleExtensionFrm.FormShow(Sender: TObject); diff --git a/demos/Lazarus_Windows/JavaScript/JSSimpleWindowBinding/uJSSimpleWindowBinding.pas b/demos/Lazarus_Windows/JavaScript/JSSimpleWindowBinding/uJSSimpleWindowBinding.pas index 2a78ec8d..dbb1ff7d 100644 --- a/demos/Lazarus_Windows/JavaScript/JSSimpleWindowBinding/uJSSimpleWindowBinding.pas +++ b/demos/Lazarus_Windows/JavaScript/JSSimpleWindowBinding/uJSSimpleWindowBinding.pas @@ -122,7 +122,7 @@ procedure TJSSimpleWindowBindingFrm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSSimpleWindowBindingFrm.FormShow(Sender: TObject); diff --git a/demos/Lazarus_Windows/JavaScript/JSWindowBindingSubProcess/uJSSimpleWindowBinding.pas b/demos/Lazarus_Windows/JavaScript/JSWindowBindingSubProcess/uJSSimpleWindowBinding.pas index 3fe4205c..e75a0ef7 100644 --- a/demos/Lazarus_Windows/JavaScript/JSWindowBindingSubProcess/uJSSimpleWindowBinding.pas +++ b/demos/Lazarus_Windows/JavaScript/JSWindowBindingSubProcess/uJSSimpleWindowBinding.pas @@ -103,7 +103,7 @@ procedure TJSSimpleWindowBindingFrm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSSimpleWindowBindingFrm.FormShow(Sender: TObject); diff --git a/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithArrayBuffer/uJSWindowBindingWithArrayBuffer.pas b/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithArrayBuffer/uJSWindowBindingWithArrayBuffer.pas index bf6b3a21..84daa333 100644 --- a/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithArrayBuffer/uJSWindowBindingWithArrayBuffer.pas +++ b/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithArrayBuffer/uJSWindowBindingWithArrayBuffer.pas @@ -146,7 +146,7 @@ procedure TJSWindowBindingWithArrayBufferFrm.Chromium1BeforePopup( var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSWindowBindingWithArrayBufferFrm.FormShow(Sender: TObject); diff --git a/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithFunction/uJSWindowBindingWithFunction.pas b/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithFunction/uJSWindowBindingWithFunction.pas index 855b99ff..f118c0c1 100644 --- a/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithFunction/uJSWindowBindingWithFunction.pas +++ b/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithFunction/uJSWindowBindingWithFunction.pas @@ -126,7 +126,7 @@ procedure TJSWindowBindingWithFunctionFrm.Chromium1BeforePopup( var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSWindowBindingWithFunctionFrm.FormShow(Sender: TObject); diff --git a/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithObject/uJSWindowBindingWithObject.pas b/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithObject/uJSWindowBindingWithObject.pas index 2a6876a4..0f69b478 100644 --- a/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithObject/uJSWindowBindingWithObject.pas +++ b/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithObject/uJSWindowBindingWithObject.pas @@ -129,7 +129,7 @@ procedure TJSWindowBindingWithObjectFrm.Chromium1BeforePopup( var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TJSWindowBindingWithObjectFrm.FormShow(Sender: TObject); diff --git a/demos/Lazarus_Windows/MobileBrowser/uMobileBrowser.pas b/demos/Lazarus_Windows/MobileBrowser/uMobileBrowser.pas index 76c3a4ed..b3aed84c 100644 --- a/demos/Lazarus_Windows/MobileBrowser/uMobileBrowser.pas +++ b/demos/Lazarus_Windows/MobileBrowser/uMobileBrowser.pas @@ -193,7 +193,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess, Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1Close(Sender: TObject; @@ -222,7 +222,7 @@ procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; userGesture: Boolean; out Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.ClearDeviceMetricsOverrideBtnClick(Sender: TObject); diff --git a/demos/Lazarus_Windows/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.pas b/demos/Lazarus_Windows/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.pas index f63a36b8..43d4df3b 100644 --- a/demos/Lazarus_Windows/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.pas +++ b/demos/Lazarus_Windows/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.pas @@ -281,7 +281,7 @@ procedure TOSRExternalPumpBrowserFrm.chrmosrBeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TOSRExternalPumpBrowserFrm.chrmosrCursorChange(Sender : TObject; diff --git a/demos/Lazarus_Windows/PopupBrowser/uChildForm.pas b/demos/Lazarus_Windows/PopupBrowser/uChildForm.pas index f0d85296..47569d54 100644 --- a/demos/Lazarus_Windows/PopupBrowser/uChildForm.pas +++ b/demos/Lazarus_Windows/PopupBrowser/uChildForm.pas @@ -245,7 +245,7 @@ procedure TChildForm.chrmosrBeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TChildForm.chrmosrCursorChange( Sender : TObject; diff --git a/demos/Lazarus_Windows/PopupBrowser/uMainForm.pas b/demos/Lazarus_Windows/PopupBrowser/uMainForm.pas index cd008c1b..42f200e1 100644 --- a/demos/Lazarus_Windows/PopupBrowser/uMainForm.pas +++ b/demos/Lazarus_Windows/PopupBrowser/uMainForm.pas @@ -179,11 +179,11 @@ procedure TMainForm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin case targetDisposition of - WOD_NEW_FOREGROUND_TAB, - WOD_NEW_BACKGROUND_TAB, - WOD_NEW_WINDOW : Result := True; // For simplicity, this demo blocks new tabs and new windows. + CEF_WOD_NEW_FOREGROUND_TAB, + CEF_WOD_NEW_BACKGROUND_TAB, + CEF_WOD_NEW_WINDOW : Result := True; // For simplicity, this demo blocks new tabs and new windows. - WOD_NEW_POPUP : Result := not(CreateClientHandler(windowInfo, client, targetFrameName, popupFeatures)); + CEF_WOD_NEW_POPUP : Result := not(CreateClientHandler(windowInfo, client, targetFrameName, popupFeatures)); else Result := False; end; diff --git a/demos/Lazarus_Windows/PopupBrowser2/uChildForm.pas b/demos/Lazarus_Windows/PopupBrowser2/uChildForm.pas index 6afd5322..faf0d8af 100644 --- a/demos/Lazarus_Windows/PopupBrowser2/uChildForm.pas +++ b/demos/Lazarus_Windows/PopupBrowser2/uChildForm.pas @@ -126,11 +126,11 @@ procedure TChildForm.Chromium1BeforePopup(Sender : TObject; var Result : Boolean); begin case targetDisposition of - WOD_NEW_FOREGROUND_TAB, - WOD_NEW_BACKGROUND_TAB, - WOD_NEW_WINDOW : Result := True; // For simplicity, this demo blocks new tabs and new windows. + CEF_WOD_NEW_FOREGROUND_TAB, + CEF_WOD_NEW_BACKGROUND_TAB, + CEF_WOD_NEW_WINDOW : Result := True; // For simplicity, this demo blocks new tabs and new windows. - WOD_NEW_POPUP : Result := not(TMainForm(Owner).CreateClientHandler(windowInfo, client, targetFrameName, popupFeatures)); + CEF_WOD_NEW_POPUP : Result := not(TMainForm(Owner).CreateClientHandler(windowInfo, client, targetFrameName, popupFeatures)); else Result := False; end; diff --git a/demos/Lazarus_Windows/PopupBrowser2/uMainForm.pas b/demos/Lazarus_Windows/PopupBrowser2/uMainForm.pas index 4d9bac08..79b59217 100644 --- a/demos/Lazarus_Windows/PopupBrowser2/uMainForm.pas +++ b/demos/Lazarus_Windows/PopupBrowser2/uMainForm.pas @@ -178,11 +178,11 @@ procedure TMainForm.Chromium1BeforePopup(Sender : TObject; var Result: Boolean); begin case targetDisposition of - WOD_NEW_FOREGROUND_TAB, - WOD_NEW_BACKGROUND_TAB, - WOD_NEW_WINDOW : Result := True; // For simplicity, this demo blocks new tabs and new windows. + CEF_WOD_NEW_FOREGROUND_TAB, + CEF_WOD_NEW_BACKGROUND_TAB, + CEF_WOD_NEW_WINDOW : Result := True; // For simplicity, this demo blocks new tabs and new windows. - WOD_NEW_POPUP : Result := not(CreateClientHandler(windowInfo, client, targetFrameName, popupFeatures)); + CEF_WOD_NEW_POPUP : Result := not(CreateClientHandler(windowInfo, client, targetFrameName, popupFeatures)); else Result := False; end; diff --git a/demos/Lazarus_Windows/PostInspectorBrowser/uPostInspectorBrowser.pas b/demos/Lazarus_Windows/PostInspectorBrowser/uPostInspectorBrowser.pas index 85178603..4c2e4503 100644 --- a/demos/Lazarus_Windows/PostInspectorBrowser/uPostInspectorBrowser.pas +++ b/demos/Lazarus_Windows/PostInspectorBrowser/uPostInspectorBrowser.pas @@ -370,7 +370,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1Close(Sender: TObject; diff --git a/demos/Lazarus_Windows/ResponseFilterBrowser/uResponseFilterBrowser.pas b/demos/Lazarus_Windows/ResponseFilterBrowser/uResponseFilterBrowser.pas index 529fdf80..29078272 100644 --- a/demos/Lazarus_Windows/ResponseFilterBrowser/uResponseFilterBrowser.pas +++ b/demos/Lazarus_Windows/ResponseFilterBrowser/uResponseFilterBrowser.pas @@ -464,7 +464,7 @@ procedure TResponseFilterBrowserFrm.Chromium1BeforePopup( Sender var Result : Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TResponseFilterBrowserFrm.Chromium1BeforeResourceLoad( Sender : TObject; diff --git a/demos/Lazarus_Windows/SchemeRegistrationBrowser/uSchemeRegistrationBrowser.pas b/demos/Lazarus_Windows/SchemeRegistrationBrowser/uSchemeRegistrationBrowser.pas index cb8b4278..fa5b439c 100644 --- a/demos/Lazarus_Windows/SchemeRegistrationBrowser/uSchemeRegistrationBrowser.pas +++ b/demos/Lazarus_Windows/SchemeRegistrationBrowser/uSchemeRegistrationBrowser.pas @@ -142,7 +142,7 @@ procedure TSchemeRegistrationBrowserFrm.Chromium1BeforePopup( var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TSchemeRegistrationBrowserFrm.Chromium1Close(Sender: TObject; diff --git a/demos/Lazarus_Windows/SchemeRegistrationBrowser_subprocess/uSchemeRegistrationBrowser.pas b/demos/Lazarus_Windows/SchemeRegistrationBrowser_subprocess/uSchemeRegistrationBrowser.pas index 864b572d..7ada4a13 100644 --- a/demos/Lazarus_Windows/SchemeRegistrationBrowser_subprocess/uSchemeRegistrationBrowser.pas +++ b/demos/Lazarus_Windows/SchemeRegistrationBrowser_subprocess/uSchemeRegistrationBrowser.pas @@ -139,7 +139,7 @@ procedure TSchemeRegistrationBrowserFrm.Chromium1BeforePopup( var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TSchemeRegistrationBrowserFrm.Chromium1Close(Sender: TObject; diff --git a/demos/Lazarus_Windows/SimpleBrowser/uSimpleBrowser.pas b/demos/Lazarus_Windows/SimpleBrowser/uSimpleBrowser.pas index df7829a1..d7cd15c0 100644 --- a/demos/Lazarus_Windows/SimpleBrowser/uSimpleBrowser.pas +++ b/demos/Lazarus_Windows/SimpleBrowser/uSimpleBrowser.pas @@ -144,7 +144,7 @@ procedure TForm1.Chromium_OnBeforePopup( Sender : TObject; var Result : Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.ChromiumWindow1AfterCreated(Sender: TObject); diff --git a/demos/Lazarus_Windows/SimpleBrowser2/uSimpleBrowser2.pas b/demos/Lazarus_Windows/SimpleBrowser2/uSimpleBrowser2.pas index f78fa868..1df3545e 100644 --- a/demos/Lazarus_Windows/SimpleBrowser2/uSimpleBrowser2.pas +++ b/demos/Lazarus_Windows/SimpleBrowser2/uSimpleBrowser2.pas @@ -130,7 +130,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; @@ -139,7 +139,7 @@ procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1Close(Sender: TObject; const browser: ICefBrowser; var aAction : TCefCloseBrowserAction); diff --git a/demos/Lazarus_Windows/SimpleExternalPumpBrowser/uSimpleExternalPumpBrowser.pas b/demos/Lazarus_Windows/SimpleExternalPumpBrowser/uSimpleExternalPumpBrowser.pas index 6d308189..8b189dda 100644 --- a/demos/Lazarus_Windows/SimpleExternalPumpBrowser/uSimpleExternalPumpBrowser.pas +++ b/demos/Lazarus_Windows/SimpleExternalPumpBrowser/uSimpleExternalPumpBrowser.pas @@ -129,7 +129,7 @@ procedure TSimpleExternalPumpBrowserFrm.Chromium_OnBeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TSimpleExternalPumpBrowserFrm.ChromiumWindow1AfterCreated(Sender: TObject); diff --git a/demos/Lazarus_Windows/SimpleOSRBrowser/usimplelazosrbrowser.pas b/demos/Lazarus_Windows/SimpleOSRBrowser/usimplelazosrbrowser.pas index da594cc9..67cd7c69 100644 --- a/demos/Lazarus_Windows/SimpleOSRBrowser/usimplelazosrbrowser.pas +++ b/demos/Lazarus_Windows/SimpleOSRBrowser/usimplelazosrbrowser.pas @@ -291,7 +291,7 @@ procedure TForm1.chrmosrBeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.chrmosrCursorChange(Sender : TObject; diff --git a/demos/Lazarus_Windows/SimpleOSRBrowser2/usimplelazosrbrowser2.pas b/demos/Lazarus_Windows/SimpleOSRBrowser2/usimplelazosrbrowser2.pas index 63727fdf..78903110 100644 --- a/demos/Lazarus_Windows/SimpleOSRBrowser2/usimplelazosrbrowser2.pas +++ b/demos/Lazarus_Windows/SimpleOSRBrowser2/usimplelazosrbrowser2.pas @@ -468,7 +468,7 @@ procedure TForm1.chrmosrBeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.chrmosrCursorChange(Sender : TObject; diff --git a/demos/Lazarus_Windows/SubProcess/uSimpleBrowser.pas b/demos/Lazarus_Windows/SubProcess/uSimpleBrowser.pas index 286f9303..5597c0f5 100644 --- a/demos/Lazarus_Windows/SubProcess/uSimpleBrowser.pas +++ b/demos/Lazarus_Windows/SubProcess/uSimpleBrowser.pas @@ -138,7 +138,7 @@ procedure TForm1.Chromium_OnBeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.ChromiumWindow1AfterCreated(Sender: TObject); diff --git a/demos/Lazarus_Windows/TabbedBrowser/uMainForm.pas b/demos/Lazarus_Windows/TabbedBrowser/uMainForm.pas index 99325ffa..1c829a4a 100644 --- a/demos/Lazarus_Windows/TabbedBrowser/uMainForm.pas +++ b/demos/Lazarus_Windows/TabbedBrowser/uMainForm.pas @@ -419,7 +419,7 @@ procedure TMainForm.Chromium_OnBeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; function TMainForm.SearchChromium(aPageIndex : integer; var aChromium : TChromium) : boolean; diff --git a/demos/Lazarus_Windows/TabbedBrowser2/uMainForm.pas b/demos/Lazarus_Windows/TabbedBrowser2/uMainForm.pas index e91a5505..08467eb3 100644 --- a/demos/Lazarus_Windows/TabbedBrowser2/uMainForm.pas +++ b/demos/Lazarus_Windows/TabbedBrowser2/uMainForm.pas @@ -504,14 +504,14 @@ begin FCriticalSection.Acquire; case targetDisposition of - WOD_NEW_FOREGROUND_TAB, - WOD_NEW_BACKGROUND_TAB : + CEF_WOD_NEW_FOREGROUND_TAB, + CEF_WOD_NEW_BACKGROUND_TAB : Result := (FHiddenTab <> nil) and FHiddenTab.CreateClientHandler(windowInfo, client, targetFrameName, popupFeatures) and PostMessage(Handle, CEF_CREATENEXTTAB, 0, ord(False)); - WOD_NEW_WINDOW, - WOD_NEW_POPUP : + CEF_WOD_NEW_WINDOW, + CEF_WOD_NEW_POPUP : Result := (FChildForm <> nil) and FChildForm.CreateClientHandler(windowInfo, client, targetFrameName, popupFeatures) and PostMessage(Handle, CEF_CREATENEXTCHILD, 0, ord(False)); @@ -533,15 +533,15 @@ begin FCriticalSection.Acquire; case targetDisposition of - WOD_NEW_FOREGROUND_TAB, - WOD_NEW_BACKGROUND_TAB : + CEF_WOD_NEW_FOREGROUND_TAB, + CEF_WOD_NEW_BACKGROUND_TAB : begin FPendingURL := targetUrl; Result := PostMessage(Handle, CEF_CREATENEXTTAB, 0, ord(True)); end; - WOD_NEW_WINDOW, - WOD_NEW_POPUP : + CEF_WOD_NEW_WINDOW, + CEF_WOD_NEW_POPUP : begin FPendingURL := targetUrl; Result := PostMessage(Handle, CEF_CREATENEXTCHILD, 0, ord(True)); diff --git a/demos/Lazarus_Windows/TinyBrowser/uTinyBrowser.pas b/demos/Lazarus_Windows/TinyBrowser/uTinyBrowser.pas index 96a64f79..63cb0536 100644 --- a/demos/Lazarus_Windows/TinyBrowser/uTinyBrowser.pas +++ b/demos/Lazarus_Windows/TinyBrowser/uTinyBrowser.pas @@ -155,7 +155,7 @@ procedure TTinyBrowser.Chromium_OnBeforePopup( Sender : TObject var Result : Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TTinyBrowser.Chromium_OnTitleChange( Sender : TObject; diff --git a/demos/Lazarus_Windows/TinyBrowser2/uTinyBrowser2.pas b/demos/Lazarus_Windows/TinyBrowser2/uTinyBrowser2.pas index 1c4a4523..bff85beb 100644 --- a/demos/Lazarus_Windows/TinyBrowser2/uTinyBrowser2.pas +++ b/demos/Lazarus_Windows/TinyBrowser2/uTinyBrowser2.pas @@ -139,7 +139,7 @@ procedure TTinyBrowser2.Chromium_OnBeforePopup(Sender: TObject; const browser: I var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TTinyBrowser2.Chromium_OnOpenUrlFromTab(Sender: TObject; @@ -148,7 +148,7 @@ procedure TTinyBrowser2.Chromium_OnOpenUrlFromTab(Sender: TObject; userGesture: Boolean; out Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; end. diff --git a/demos/Lazarus_Windows/ToolBoxBrowser/uChildForm.pas b/demos/Lazarus_Windows/ToolBoxBrowser/uChildForm.pas index a6cc3b28..54153dea 100644 --- a/demos/Lazarus_Windows/ToolBoxBrowser/uChildForm.pas +++ b/demos/Lazarus_Windows/ToolBoxBrowser/uChildForm.pas @@ -105,7 +105,7 @@ procedure TChildForm.Chromium1BeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TChildForm.Chromium1Close(Sender: TObject; const browser: ICefBrowser; var aAction : TCefCloseBrowserAction); diff --git a/demos/Lazarus_Windows/ToolBoxBrowser2/uMainForm.pas b/demos/Lazarus_Windows/ToolBoxBrowser2/uMainForm.pas index 74f3a614..1d8bebd4 100644 --- a/demos/Lazarus_Windows/ToolBoxBrowser2/uMainForm.pas +++ b/demos/Lazarus_Windows/ToolBoxBrowser2/uMainForm.pas @@ -186,7 +186,7 @@ procedure TMainForm.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess, Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TMainForm.Chromium1TitleChange(Sender: TObject; diff --git a/demos/Lazarus_Windows/VirtualUIBrowser/uVirtualUIBrowser.pas b/demos/Lazarus_Windows/VirtualUIBrowser/uVirtualUIBrowser.pas index 3bb963e9..94dde9b8 100644 --- a/demos/Lazarus_Windows/VirtualUIBrowser/uVirtualUIBrowser.pas +++ b/demos/Lazarus_Windows/VirtualUIBrowser/uVirtualUIBrowser.pas @@ -275,7 +275,7 @@ procedure TForm1.chrmosrBeforePopup(Sender: TObject; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.chrmosrCursorChange(Sender : TObject; diff --git a/demos/Lazarus_Windows/WebpageSnapshot/uCEFBrowserThread.pas b/demos/Lazarus_Windows/WebpageSnapshot/uCEFBrowserThread.pas index 55cd34be..26ef4e0d 100644 --- a/demos/Lazarus_Windows/WebpageSnapshot/uCEFBrowserThread.pas +++ b/demos/Lazarus_Windows/WebpageSnapshot/uCEFBrowserThread.pas @@ -545,7 +545,7 @@ end; procedure TCEFBrowserThread.Browser_OnBeforePopup(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const targetUrl, targetFrameName: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean; const popupFeatures: TCefPopupFeatures; var windowInfo: TCefWindowInfo; var client: ICefClient; var settings: TCefBrowserSettings; var extra_info: ICefDictionaryValue; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TCEFBrowserThread.Browser_OnBeforeClose(Sender: TObject; const browser: ICefBrowser); diff --git a/demos/Lazarus_any_OS/BrowserWindow/uBrowserWindow.pas b/demos/Lazarus_any_OS/BrowserWindow/uBrowserWindow.pas index bc3c0edf..32236b05 100644 --- a/demos/Lazarus_any_OS/BrowserWindow/uBrowserWindow.pas +++ b/demos/Lazarus_any_OS/BrowserWindow/uBrowserWindow.pas @@ -118,7 +118,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; @@ -127,7 +127,7 @@ procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.FormCloseQuery(Sender: TObject; var CanClose: Boolean); diff --git a/demos/Lazarus_any_OS/BrowserWindowDom/uBrowserWindowDom.pas b/demos/Lazarus_any_OS/BrowserWindowDom/uBrowserWindowDom.pas index 607f6752..b5caaba8 100644 --- a/demos/Lazarus_any_OS/BrowserWindowDom/uBrowserWindowDom.pas +++ b/demos/Lazarus_any_OS/BrowserWindowDom/uBrowserWindowDom.pas @@ -169,7 +169,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; @@ -178,7 +178,7 @@ procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.FormCloseQuery(Sender: TObject; var CanClose: Boolean); diff --git a/demos/Lazarus_any_OS/BrowserWindowEx/uBrowserWindowEx.pas b/demos/Lazarus_any_OS/BrowserWindowEx/uBrowserWindowEx.pas index cd94cd8a..6bee50bc 100644 --- a/demos/Lazarus_any_OS/BrowserWindowEx/uBrowserWindowEx.pas +++ b/demos/Lazarus_any_OS/BrowserWindowEx/uBrowserWindowEx.pas @@ -234,7 +234,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.MaybeTerminateApp(Sender: TObject); @@ -304,7 +304,7 @@ procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.MaybeCloseApp(Sender: TObject); diff --git a/demos/Lazarus_any_OS/BrowserWindowOsrDom/uBrowserWindowDom.pas b/demos/Lazarus_any_OS/BrowserWindowOsrDom/uBrowserWindowDom.pas index 3e9cab80..0df2c3f8 100644 --- a/demos/Lazarus_any_OS/BrowserWindowOsrDom/uBrowserWindowDom.pas +++ b/demos/Lazarus_any_OS/BrowserWindowOsrDom/uBrowserWindowDom.pas @@ -175,7 +175,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; @@ -184,7 +184,7 @@ procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.FormCloseQuery(Sender: TObject; var CanClose: Boolean); diff --git a/demos/Lazarus_any_OS/ExternalPumpBrowser/uExternalPumpBrowser.pas b/demos/Lazarus_any_OS/ExternalPumpBrowser/uExternalPumpBrowser.pas index aa52ba8b..bc372a7c 100644 --- a/demos/Lazarus_any_OS/ExternalPumpBrowser/uExternalPumpBrowser.pas +++ b/demos/Lazarus_any_OS/ExternalPumpBrowser/uExternalPumpBrowser.pas @@ -142,7 +142,7 @@ procedure TForm1.Chromium1BeforePopup(Sender: TObject; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; @@ -151,7 +151,7 @@ procedure TForm1.Chromium1OpenUrlFromTab(Sender: TObject; Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TForm1.FormActivate(Sender: TObject); diff --git a/docs/cef4delphi.chm b/docs/cef4delphi.chm index 2d6770ac..6d26075d 100644 Binary files a/docs/cef4delphi.chm and b/docs/cef4delphi.chm differ diff --git a/packages/cef4delphi_lazarus.lpk b/packages/cef4delphi_lazarus.lpk index 2297a3dc..a0b0f12e 100644 --- a/packages/cef4delphi_lazarus.lpk +++ b/packages/cef4delphi_lazarus.lpk @@ -21,7 +21,7 @@ - + diff --git a/source/uCEFApplicationCore.pas b/source/uCEFApplicationCore.pas index 87d02190..1e43f110 100644 --- a/source/uCEFApplicationCore.pas +++ b/source/uCEFApplicationCore.pas @@ -91,6 +91,7 @@ type FCookieableSchemesList : ustring; FCookieableSchemesExcludeDefaults : boolean; FChromePolicyId : ustring; + FChromeAppIconId : integer; // Fields used to set command line switches FSingleProcess : boolean; @@ -201,6 +202,7 @@ type FOnRegisterCustomPreferences : TOnRegisterCustomPreferencesEvent; FOnContextInitialized : TOnContextInitializedEvent; FOnBeforeChildProcessLaunch : TOnBeforeChildProcessLaunchEvent; + FOnAlreadyRunningAppRelaunch : TOnAlreadyRunningAppRelaunchEvent; FOnScheduleMessagePumpWork : TOnScheduleMessagePumpWorkEvent; FOnGetDefaultClient : TOnGetDefaultClientEvent; @@ -326,6 +328,7 @@ type procedure doOnRegisterCustomPreferences(type_: TCefPreferencesType; registrar: PCefPreferenceRegistrar); virtual; procedure doOnContextInitialized; virtual; procedure doOnBeforeChildProcessLaunch(const commandLine: ICefCommandLine); virtual; + procedure doOnAlreadyRunningAppRelaunch(const commandLine: ICefCommandLine; const current_directory: ustring; var aResult: boolean); virtual; procedure doOnScheduleMessagePumpWork(const delayMs: Int64); virtual; procedure doGetDefaultClient(var aClient : ICefClient); virtual; @@ -531,30 +534,43 @@ type /// property CommandLineArgsDisabled : Boolean read FCommandLineArgsDisabled write FCommandLineArgsDisabled; /// - /// The location where data for the global browser cache will be stored on + /// The directory where data for the global browser cache will be stored on /// disk. If this value is non-empty then it must be an absolute path that is /// either equal to or a child directory of TCefSettings.root_cache_path. If /// this value is empty then browsers will be created in "incognito mode" - /// where in-memory caches are used for storage and no data is persisted to - /// disk. HTML5 databases such as localStorage will only persist across - /// sessions if a cache path is specified. Can be overridden for individual - /// CefRequestContext instances via the TCefRequestContextSettings.cache_path - /// value. When using the Chrome runtime the "default" profile will be used if - /// |cache_path| and |root_cache_path| have the same value. + /// where in-memory caches are used for storage and no profile-specific data + /// is persisted to disk (installation-specific data will still be persisted + /// in root_cache_path). HTML5 databases such as localStorage will only + /// persist across sessions if a cache path is specified. Can be overridden + /// for individual ICefRequestContext instances via the + /// ICefRequestContextSettings.cache_path value. When using the Chrome runtime + /// any child directory value will be ignored and the "default" profile (also + /// a child directory) will be used instead. /// property Cache : ustring read FCache write SetCache; /// - /// The root directory that all TCefSettings.cache_path and - /// TCefRequestContextSettings.cache_path values must have in common. If this - /// value is empty and TCefSettings.cache_path is non-empty then it will - /// default to the TCefSettings.cache_path value. If both values are empty - /// then the default platform-specific directory will be used + /// The root directory for installation-specific data and the parent directory + /// for profile-specific data. All TCefSettings.cache_path and + /// ICefRequestContextSettings.cache_path values must have this parent + /// directory in common. If this value is empty and TCefSettings.cache_path is + /// non-empty then it will default to the TCefSettings.cache_path value. Any + /// non-empty value must be an absolute path. If both values are empty then + /// the default platform-specific directory will be used /// ("~/.config/cef_user_data" directory on Linux, "~/Library/Application /// Support/CEF/User Data" directory on MacOS, "AppData\Local\CEF\User Data" - /// directory under the user profile directory on Windows). If this value is - /// non-empty then it must be an absolute path. Failure to set this value - /// correctly may result in the sandbox blocking read/write access to certain - /// files. + /// directory under the user profile directory on Windows). Use of the default + /// directory is not recommended in production applications (see below). + /// Multiple application instances writing to the same root_cache_path + /// directory could result in data corruption. A process singleton lock based + /// on the root_cache_path value is therefore used to protect against this. + /// This singleton behavior applies to all CEF-based applications using + /// version 120 or newer. You should customize root_cache_path for your + /// application and implement ICefBrowserProcessHandler.OnAlreadyRunningAppRelaunch, + /// which will then be called on any app relaunch + /// with the same root_cache_path value. + /// Failure to set the root_cache_path value correctly may result in startup + /// crashes or other unexpected behaviors (for example, the sandbox blocking + /// read/write access to certain files). /// property RootCache : ustring read FRootCache write SetRootCache; /// @@ -720,6 +736,14 @@ type /// property ChromePolicyId : ustring read FChromePolicyId write FChromePolicyId; /// + /// Specify an ID for an ICON resource that can be loaded from the main + /// executable and used when creating default Chrome windows such as DevTools + /// and Task Manager. If unspecified the default Chromium ICON (IDR_MAINFRAME + /// [101]) will be loaded from libcef.dll. Only supported with the Chrome + /// runtime on Windows. + /// + property ChromeAppIconId : integer read FChromeAppIconId write FChromeAppIconId; + /// /// Runs the renderer and plugins in the same process as the browser. /// /// @@ -1441,6 +1465,26 @@ type /// property OnBeforeChildProcessLaunch : TOnBeforeChildProcessLaunchEvent read FOnBeforeChildProcessLaunch write FOnBeforeChildProcessLaunch; /// + /// Implement this function to provide app-specific behavior when an already + /// running app is relaunched with the same TCefSettings.root_cache_path value. + /// For example, activate an existing app window or create a new app window. + /// |command_line| will be read-only. Do not keep a reference to + /// |command_line| outside of this function. Return true (1) if the relaunch + /// is handled or false (0) for default relaunch behavior. Default behavior + /// will create a new default styled Chrome window. + /// To avoid cache corruption only a single app instance is allowed to run for + /// a given TCefSettings.root_cache_path value. On relaunch the app checks a + /// process singleton lock and then forwards the new launch arguments to the + /// already running app process before exiting early. Client apps should + /// therefore check the cef_initialize() return value for early exit before + /// proceeding. + /// This function will be called on the browser process UI thread. + /// + /// + /// CEF source file: /include/capi/cef_browser_process_handler_capi.h (cef_browser_process_handler_t) + /// + property OnAlreadyRunningAppRelaunch : TOnAlreadyRunningAppRelaunchEvent read FOnAlreadyRunningAppRelaunch write FOnAlreadyRunningAppRelaunch; + /// /// Called from any thread when work has been scheduled for the browser /// process main (UI) thread. This callback is used in combination with /// TCefSettings.external_message_pump and GlobalCEFApp.DoMessageLoopWork in @@ -1755,6 +1799,7 @@ begin FCookieableSchemesList := ''; FCookieableSchemesExcludeDefaults := False; FChromePolicyId := ''; + FChromeAppIconId := 0; // Fields used to set command line switches FSingleProcess := False; @@ -1882,6 +1927,7 @@ begin FOnRegisterCustomPreferences := nil; FOnContextInitialized := nil; FOnBeforeChildProcessLaunch := nil; + FOnAlreadyRunningAppRelaunch := nil; FOnScheduleMessagePumpWork := nil; FOnGetDefaultClient := nil; @@ -2011,6 +2057,12 @@ begin FOnBeforeChildProcessLaunch(commandLine); end; +procedure TCefApplicationCore.doOnAlreadyRunningAppRelaunch(const commandLine: ICefCommandLine; const current_directory: ustring; var aResult: boolean); +begin + if assigned(FOnAlreadyRunningAppRelaunch) then + FOnAlreadyRunningAppRelaunch(commandLine, current_directory, aResult); +end; + procedure TCefApplicationCore.doOnScheduleMessagePumpWork(const delayMs: Int64); begin if assigned(FOnScheduleMessagePumpWork) then @@ -2721,6 +2773,7 @@ begin aSettings.cookieable_schemes_list := CefString(FCookieableSchemesList); aSettings.cookieable_schemes_exclude_defaults := Ord(FCookieableSchemesExcludeDefaults); aSettings.chrome_policy_id := CefString(FChromePolicyId); + aSettings.chrome_app_icon_id := FChromeAppIconId; end; function TCefApplicationCore.InitializeLibrary(const aApp : ICefApp) : boolean; @@ -3348,6 +3401,7 @@ begin (FMustCreateBrowserProcessHandler or assigned(FOnContextInitialized) or assigned(FOnBeforeChildProcessLaunch) or + assigned(FOnAlreadyRunningAppRelaunch) or assigned(FOnScheduleMessagePumpWork)) or assigned(FOnGetDefaultClient)); end; diff --git a/source/uCEFApplicationEvents.pas b/source/uCEFApplicationEvents.pas index 66df5d7f..7432865f 100644 --- a/source/uCEFApplicationEvents.pas +++ b/source/uCEFApplicationEvents.pas @@ -22,6 +22,7 @@ type TOnRegisterCustomPreferencesEvent = {$IFDEF DELPHI12_UP}reference to{$ENDIF} procedure(type_: TCefPreferencesType; const registrar: TCefPreferenceRegistrarRef) {$IFNDEF DELPHI12_UP}{$IFNDEF FPC}of object{$ENDIF}{$ENDIF}; TOnContextInitializedEvent = {$IFDEF DELPHI12_UP}reference to{$ENDIF} procedure() {$IFNDEF DELPHI12_UP}{$IFNDEF FPC} of object{$ENDIF}{$ENDIF}; TOnBeforeChildProcessLaunchEvent = {$IFDEF DELPHI12_UP}reference to{$ENDIF} procedure(const commandLine: ICefCommandLine) {$IFNDEF DELPHI12_UP}{$IFNDEF FPC}of object{$ENDIF}{$ENDIF}; + TOnAlreadyRunningAppRelaunchEvent = {$IFDEF DELPHI12_UP}reference to{$ENDIF} procedure(const commandLine: ICefCommandLine; const current_directory: ustring; var aResult: boolean) {$IFNDEF DELPHI12_UP}{$IFNDEF FPC}of object{$ENDIF}{$ENDIF}; TOnScheduleMessagePumpWorkEvent = {$IFDEF DELPHI12_UP}reference to{$ENDIF} procedure(const delayMs: Int64) {$IFNDEF DELPHI12_UP}{$IFNDEF FPC} of object{$ENDIF}{$ENDIF}; TOnGetDefaultClientEvent = {$IFDEF DELPHI12_UP}reference to{$ENDIF} procedure(var aClient : ICefClient) {$IFNDEF DELPHI12_UP}{$IFNDEF FPC} of object{$ENDIF}{$ENDIF}; diff --git a/source/uCEFBrowserProcessHandler.pas b/source/uCEFBrowserProcessHandler.pas index 3b19f43f..83dadb80 100644 --- a/source/uCEFBrowserProcessHandler.pas +++ b/source/uCEFBrowserProcessHandler.pas @@ -25,6 +25,7 @@ type procedure OnRegisterCustomPreferences(type_: TCefPreferencesType; registrar: PCefPreferenceRegistrar); virtual; abstract; procedure OnContextInitialized; virtual; abstract; procedure OnBeforeChildProcessLaunch(const commandLine: ICefCommandLine); virtual; abstract; + procedure OnAlreadyRunningAppRelaunch(const commandLine: ICefCommandLine; const current_directory: ustring; var aResult: boolean); virtual; abstract; procedure OnScheduleMessagePumpWork(const delayMs: Int64); virtual; abstract; procedure GetDefaultClient(var aClient : ICefClient); virtual; @@ -41,6 +42,7 @@ type procedure OnRegisterCustomPreferences(type_: TCefPreferencesType; registrar: PCefPreferenceRegistrar); override; procedure OnContextInitialized; override; procedure OnBeforeChildProcessLaunch(const commandLine: ICefCommandLine); override; + procedure OnAlreadyRunningAppRelaunch(const commandLine: ICefCommandLine; const current_directory: ustring; var aResult: boolean); override; procedure OnScheduleMessagePumpWork(const delayMs: Int64); override; procedure GetDefaultClient(var aClient : ICefClient); override; @@ -96,6 +98,25 @@ begin TCefBrowserProcessHandlerOwn(TempObject).OnBeforeChildProcessLaunch(TCefCommandLineRef.UnWrap(command_line)); end; +function cef_browser_process_handler_on_already_running_app_relaunch( self : PCefBrowserProcessHandler; + command_line : PCefCommandLine; + const current_directory : PCefString): integer; stdcall; +var + TempObject : TObject; + TempResult : boolean; +begin + TempObject := CefGetObject(self); + TempResult := False; + + if (TempObject <> nil) and + (TempObject is TCefBrowserProcessHandlerOwn) then + TCefBrowserProcessHandlerOwn(TempObject).OnAlreadyRunningAppRelaunch(TCefCommandLineRef.UnWrap(command_line), + CefString(current_directory), + TempResult); + + Result := Ord(TempResult); +end; + procedure cef_browser_process_handler_on_schedule_message_pump_work(self : PCefBrowserProcessHandler; delay_ms : Int64); stdcall; var @@ -136,6 +157,7 @@ begin on_register_custom_preferences := {$IFDEF FPC}@{$ENDIF}cef_browser_process_handler_on_register_custom_preferences; on_context_initialized := {$IFDEF FPC}@{$ENDIF}cef_browser_process_handler_on_context_initialized; on_before_child_process_launch := {$IFDEF FPC}@{$ENDIF}cef_browser_process_handler_on_before_child_process_launch; + on_already_running_app_relaunch := {$IFDEF FPC}@{$ENDIF}cef_browser_process_handler_on_already_running_app_relaunch; on_schedule_message_pump_work := {$IFDEF FPC}@{$ENDIF}cef_browser_process_handler_on_schedule_message_pump_work; get_default_client := {$IFDEF FPC}@{$ENDIF}cef_browser_process_handler_get_default_client; end; @@ -202,6 +224,17 @@ begin end; end; +procedure TCefCustomBrowserProcessHandler.OnAlreadyRunningAppRelaunch(const commandLine: ICefCommandLine; const current_directory: ustring; var aResult: boolean); +begin + try + if (FCefApp <> nil) then + IApplicationCoreEvents(FCefApp).doOnAlreadyRunningAppRelaunch(commandLine, current_directory, aResult); + except + on e : exception do + if CustomExceptionHandler('TCefCustomBrowserProcessHandler.OnAlreadyRunningAppRelaunch', e) then raise; + end; +end; + procedure TCefCustomBrowserProcessHandler.OnScheduleMessagePumpWork(const delayMs: Int64); begin try diff --git a/source/uCEFConstants.pas b/source/uCEFConstants.pas index 6be57453..d2a0a7eb 100644 --- a/source/uCEFConstants.pas +++ b/source/uCEFConstants.pas @@ -2067,6 +2067,7 @@ const CEF_PERMISSION_TYPE_STORAGE_ACCESS = 1 shl 17; CEF_PERMISSION_TYPE_VR_SESSION = 1 shl 18; CEF_PERMISSION_TYPE_WINDOW_MANAGEMENT = 1 shl 19; + CEF_PERMISSION_TYPE_FILE_SYSTEM_ACCESS = 1 shl 20; /// /// Platform API hash. diff --git a/source/uCEFInterfaces.pas b/source/uCEFInterfaces.pas index 6018e479..a409ebae 100644 --- a/source/uCEFInterfaces.pas +++ b/source/uCEFInterfaces.pas @@ -282,6 +282,7 @@ type procedure doOnRegisterCustomPreferences(type_: TCefPreferencesType; registrar: PCefPreferenceRegistrar); procedure doOnContextInitialized; procedure doOnBeforeChildProcessLaunch(const commandLine: ICefCommandLine); + procedure doOnAlreadyRunningAppRelaunch(const commandLine: ICefCommandLine; const current_directory: ustring; var aResult: boolean); procedure doOnScheduleMessagePumpWork(const delayMs: Int64); procedure doGetDefaultClient(var aClient : ICefClient); @@ -4574,26 +4575,23 @@ type ICefBrowserProcessHandler = interface(ICefBaseRefCounted) ['{27291B7A-C0AE-4EE0-9115-15C810E22F6C}'] /// - /// Provides an opportunity to register custom preferences prior to global and - /// request context initialization. - /// - /// If |type| is CEF_PREFERENCES_TYPE_GLOBAL the registered preferences can be + /// Provides an opportunity to register custom preferences prior to global and + /// request context initialization. + /// If |type| is CEF_PREFERENCES_TYPE_GLOBAL the registered preferences can be /// accessed via ICefPreferenceManager.GetGlobalPreferences after /// OnContextInitialized is called. Global preferences are registered a single /// time at application startup. See related TCefSettings.cache_path and - /// TCefSettings.persist_user_preferences configuration. - /// - /// If |type| is CEF_PREFERENCES_TYPE_REQUEST_CONTEXT the preferences can be + /// TCefSettings.persist_user_preferences configuration. + /// If |type| is CEF_PREFERENCES_TYPE_REQUEST_CONTEXT the preferences can be /// accessed via the ICefRequestContext after /// ICefRequestContextHandler.OnRequestContextInitialized is called. /// Request context preferences are registered each time a new /// ICefRequestContext is created. It is intended but not required that all /// request contexts have the same registered preferences. See related /// TCefRequestContextSettings.cache_path and - /// TCefRequestContextSettings.persist_user_preferences configuration. - /// - /// Do not keep a reference to the |registrar| object. This function is called - /// on the browser process UI thread. + /// TCefRequestContextSettings.persist_user_preferences configuration. + /// Do not keep a reference to the |registrar| object. This function is called + /// on the browser process UI thread. /// procedure OnRegisterCustomPreferences(type_: TCefPreferencesType; registrar: PCefPreferenceRegistrar); /// @@ -4610,6 +4608,23 @@ type /// procedure OnBeforeChildProcessLaunch(const commandLine: ICefCommandLine); /// + /// Implement this function to provide app-specific behavior when an already + /// running app is relaunched with the same TCefSettings.root_cache_path value. + /// For example, activate an existing app window or create a new app window. + /// |command_line| will be read-only. Do not keep a reference to + /// |command_line| outside of this function. Return true (1) if the relaunch + /// is handled or false (0) for default relaunch behavior. Default behavior + /// will create a new default styled Chrome window. + /// To avoid cache corruption only a single app instance is allowed to run for + /// a given TCefSettings.root_cache_path value. On relaunch the app checks a + /// process singleton lock and then forwards the new launch arguments to the + /// already running app process before exiting early. Client apps should + /// therefore check the cef_initialize() return value for early exit before + /// proceeding. + /// This function will be called on the browser process UI thread. + /// + procedure OnAlreadyRunningAppRelaunch(const commandLine: ICefCommandLine; const current_directory: ustring; var aResult: boolean); + /// /// Called from any thread when work has been scheduled for the browser /// process main (UI) thread. This callback is used in combination with /// TCefSettings.external_message_pump and GlobalCEFApp.DoMessageLoopWork in diff --git a/source/uCEFOsrBrowserWindow.pas b/source/uCEFOsrBrowserWindow.pas index 8c7df45d..04b54c9a 100644 --- a/source/uCEFOsrBrowserWindow.pas +++ b/source/uCEFOsrBrowserWindow.pas @@ -246,7 +246,7 @@ procedure TOsrBrowserWindow.DoGetChromiumBeforePopup(Sender: TObject; var noJavascriptAccess: Boolean; var Result: Boolean); begin // For simplicity, this demo blocks all popup windows and new tabs - Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); + Result := (targetDisposition in [CEF_WOD_NEW_FOREGROUND_TAB, CEF_WOD_NEW_BACKGROUND_TAB, CEF_WOD_NEW_POPUP, CEF_WOD_NEW_WINDOW]); end; procedure TOsrBrowserWindow.DoGetChromiumPopupShow(Sender: TObject; diff --git a/source/uCEFRequestContext.pas b/source/uCEFRequestContext.pas index 3c3851e0..a2649cba 100644 --- a/source/uCEFRequestContext.pas +++ b/source/uCEFRequestContext.pas @@ -270,18 +270,31 @@ type /// Returns the global context object. /// class function Global: ICefRequestContext; reintroduce; - /// /// Creates a new context object with the specified |settings| and optional /// |handler|. /// + /// Pointer to TCefRequestContextSettings. + /// Optional handler for the request context. class function New(const settings: PCefRequestContextSettings; const handler: ICefRequestContextHandler = nil): ICefRequestContext; overload; + /// + /// Creates a new context object with the specified settings and optional + /// |handler|. + /// + /// The directory where cache data for this request context will be stored on disk. See TCefRequestContextSettings.cache_path for more information. + /// Comma delimited ordered list of language codes without any whitespace that will be used in the "Accept-Language" HTTP header. See TCefRequestContextSettings.accept_language_list for more information. + /// Comma delimited list of schemes supported by the associated ICefCookieManager. See TCefRequestContextSettings.cookieable_schemes_list for more information. + /// Setting this parameter to true will disable all loading and saving of cookies. See TCefRequestContextSettings.cookieable_schemes_list for more information. + /// To persist session cookies (cookies without an expiry date or validity interval) by default when using the global cookie manager set this value to true. See TCefRequestContextSettings.persist_session_cookies for more information. + /// To persist user preferences as a JSON file in the cache path directory set this value to true. See TCefRequestContextSettings.persist_user_preferences for more information. + /// Optional handler for the request context. class function New(const aCache, aAcceptLanguageList, aCookieableSchemesList : ustring; aCookieableSchemesExcludeDefaults, aPersistSessionCookies, aPersistUserPreferences : boolean; const handler: ICefRequestContextHandler = nil): ICefRequestContext; overload; - /// /// Creates a new context object that shares storage with |other| and uses an /// optional |handler|. /// + /// Another ICefRequestContext instance that will share storage with the new ICefRequestContext instance. + /// Optional handler for the request context. class function Shared(const other: ICefRequestContext; const handler: ICefRequestContextHandler): ICefRequestContext; end; diff --git a/source/uCEFTypes.pas b/source/uCEFTypes.pas index 7c538755..5c775aab 100644 --- a/source/uCEFTypes.pas +++ b/source/uCEFTypes.pas @@ -1712,43 +1712,43 @@ type /// /// Unknown disposition. /// - WOD_UNKNOWN, + CEF_WOD_UNKNOWN, /// /// Current tab. This is the default in most cases. /// - WOD_CURRENT_TAB, + CEF_WOD_CURRENT_TAB, /// /// Indicates that only one tab with the url should exist in the same window. /// - WOD_SINGLETON_TAB, + CEF_WOD_SINGLETON_TAB, /// /// Shift key + Middle mouse button or meta/ctrl key while clicking. /// - WOD_NEW_FOREGROUND_TAB, + CEF_WOD_NEW_FOREGROUND_TAB, /// /// Middle mouse button or meta/ctrl key while clicking. /// - WOD_NEW_BACKGROUND_TAB, + CEF_WOD_NEW_BACKGROUND_TAB, /// /// New popup window. /// - WOD_NEW_POPUP, + CEF_WOD_NEW_POPUP, /// /// Shift key while clicking. /// - WOD_NEW_WINDOW, + CEF_WOD_NEW_WINDOW, /// /// Alt key while clicking. /// - WOD_SAVE_TO_DISK, + CEF_WOD_SAVE_TO_DISK, /// /// New off-the-record (incognito) window. /// - WOD_OFF_THE_RECORD, + CEF_WOD_OFF_THE_RECORD, /// /// Special case error condition from the renderer. /// - WOD_IGNORE_ACTION, + CEF_WOD_IGNORE_ACTION, /// /// Activates an existing tab containing the url, rather than navigating. /// This is similar to SINGLETON_TAB, but searches across all windows from @@ -1757,11 +1757,11 @@ type /// no session history; and behaves like CURRENT_TAB instead of /// NEW_FOREGROUND_TAB when no existing tab is found. /// - WOD_SWITCH_TO_TAB, + CEF_WOD_SWITCH_TO_TAB, /// /// Creates a new document picture-in-picture window showing a child WebView. /// - WOD_NEW_PICTURE_IN_PICTURE + CEF_WOD_NEW_PICTURE_IN_PICTURE ); /// @@ -3057,30 +3057,43 @@ type /// command_line_args_disabled : Integer; /// - /// The location where data for the global browser cache will be stored on + /// The directory where data for the global browser cache will be stored on /// disk. If this value is non-empty then it must be an absolute path that is - /// either equal to or a child directory of TCefSettings.root_cache_path. If + /// either equal to or a child directory of CefSettings.root_cache_path. If /// this value is empty then browsers will be created in "incognito mode" - /// where in-memory caches are used for storage and no data is persisted to - /// disk. HTML5 databases such as localStorage will only persist across - /// sessions if a cache path is specified. Can be overridden for individual - /// CefRequestContext instances via the TCefRequestContextSettings.cache_path - /// value. When using the Chrome runtime the "default" profile will be used if - /// |cache_path| and |root_cache_path| have the same value. + /// where in-memory caches are used for storage and no profile-specific data + /// is persisted to disk (installation-specific data will still be persisted + /// in root_cache_path). HTML5 databases such as localStorage will only + /// persist across sessions if a cache path is specified. Can be overridden + /// for individual ICefRequestContext instances via the + /// ICefRequestContextSettings.cache_path value. When using the Chrome runtime + /// any child directory value will be ignored and the "default" profile (also + /// a child directory) will be used instead. /// cache_path : TCefString; /// - /// The root directory that all TCefSettings.cache_path and - /// TCefRequestContextSettings.cache_path values must have in common. If this - /// value is empty and TCefSettings.cache_path is non-empty then it will - /// default to the TCefSettings.cache_path value. If both values are empty - /// then the default platform-specific directory will be used + /// The root directory for installation-specific data and the parent directory + /// for profile-specific data. All TCefSettings.cache_path and + /// ICefRequestContextSettings.cache_path values must have this parent + /// directory in common. If this value is empty and TCefSettings.cache_path is + /// non-empty then it will default to the TCefSettings.cache_path value. Any + /// non-empty value must be an absolute path. If both values are empty then + /// the default platform-specific directory will be used /// ("~/.config/cef_user_data" directory on Linux, "~/Library/Application /// Support/CEF/User Data" directory on MacOS, "AppData\Local\CEF\User Data" - /// directory under the user profile directory on Windows). If this value is - /// non-empty then it must be an absolute path. Failure to set this value - /// correctly may result in the sandbox blocking read/write access to certain - /// files. + /// directory under the user profile directory on Windows). Use of the default + /// directory is not recommended in production applications (see below). + /// Multiple application instances writing to the same root_cache_path + /// directory could result in data corruption. A process singleton lock based + /// on the root_cache_path value is therefore used to protect against this. + /// This singleton behavior applies to all CEF-based applications using + /// version 120 or newer. You should customize root_cache_path for your + /// application and implement ICefBrowserProcessHandler.OnAlreadyRunningAppRelaunch, + /// which will then be called on any app relaunch + /// with the same root_cache_path value. + /// Failure to set the root_cache_path value correctly may result in startup + /// crashes or other unexpected behaviors (for example, the sandbox blocking + /// read/write access to certain files). /// root_cache_path : TCefString; /// @@ -3229,7 +3242,6 @@ type /// cookieable_schemes_list : TCefString; cookieable_schemes_exclude_defaults : integer; - /// /// Specify an ID to enable Chrome policy management via Platform and OS-user /// policies. On Windows, this is a registry key like @@ -3243,6 +3255,14 @@ type /// for details. /// chrome_policy_id : TCefString; + /// + /// Specify an ID for an ICON resource that can be loaded from the main + /// executable and used when creating default Chrome windows such as DevTools + /// and Task Manager. If unspecified the default Chromium ICON (IDR_MAINFRAME + /// [101]) will be loaded from libcef.dll. Only supported with the Chrome + /// runtime on Windows. + /// + chrome_app_icon_id : Integer; end; /// @@ -3672,14 +3692,15 @@ type /// size : NativeUInt; /// - /// The location where cache data for this request context will be stored on + /// The directory where cache data for this request context will be stored on /// disk. If this value is non-empty then it must be an absolute path that is /// either equal to or a child directory of TCefSettings.root_cache_path. If /// this value is empty then browsers will be created in "incognito mode" - /// where in-memory caches are used for storage and no data is persisted to - /// disk. HTML5 databases such as localStorage will only persist across - /// sessions if a cache path is specified. To share the global browser cache - /// and related configuration set this value to match the + /// where in-memory caches are used for storage and no profile-specific data + /// is persisted to disk (installation-specific data will still be persisted + /// in root_cache_path). HTML5 databases such as localStorage will only + /// persist across sessions if a cache path is specified. To share the global + /// browser cache and related configuration set this value to match the /// TCefSettings.cache_path value. /// cache_path : TCefString; @@ -3710,7 +3731,7 @@ type accept_language_list : TCefString; /// /// Comma delimited list of schemes supported by the associated - /// CefCookieManager. If |cookieable_schemes_exclude_defaults| is false (0) + /// ICefCookieManager. If |cookieable_schemes_exclude_defaults| is false (0) /// the default schemes ("http", "https", "ws" and "wss") will also be /// supported. Not specifying a |cookieable_schemes_list| value and setting /// |cookieable_schemes_exclude_defaults| to true (1) will disable all loading @@ -4412,6 +4433,11 @@ type /// permission request. /// CEF_CONTENT_SETTING_TYPE_FILE_SYSTEM_ACCESS_EXTENDED_PERMISSION, + /// + /// Content Setting for temporary 3PC accesses granted by user behavior + /// heuristics. + /// + CEF_CONTENT_SETTING_TYPE_TPCD_HEURISTICS_GRANTS, CEF_CONTENT_SETTING_TYPE_NUM_TYPES ); @@ -7088,6 +7114,7 @@ type on_register_custom_preferences : procedure(self: PCefBrowserProcessHandler; type_: TCefPreferencesType; registrar: PCefPreferenceRegistrar); stdcall; on_context_initialized : procedure(self: PCefBrowserProcessHandler); stdcall; on_before_child_process_launch : procedure(self: PCefBrowserProcessHandler; command_line: PCefCommandLine); stdcall; + on_already_running_app_relaunch : function(self: PCefBrowserProcessHandler; command_line: PCefCommandLine; const current_directory: PCefString): integer; stdcall; on_schedule_message_pump_work : procedure(self: PCefBrowserProcessHandler; delay_ms: Int64); stdcall; get_default_client : function(self: PCefBrowserProcessHandler): PCefClient; stdcall; end; diff --git a/source/uCEFVersion.inc b/source/uCEFVersion.inc index 18c36dea..b3323cf3 100644 --- a/source/uCEFVersion.inc +++ b/source/uCEFVersion.inc @@ -1,9 +1,9 @@ - CEF_SUPPORTED_VERSION_MAJOR = 119; - CEF_SUPPORTED_VERSION_MINOR = 4; - CEF_SUPPORTED_VERSION_RELEASE = 7; + CEF_SUPPORTED_VERSION_MAJOR = 120; + CEF_SUPPORTED_VERSION_MINOR = 1; + CEF_SUPPORTED_VERSION_RELEASE = 8; CEF_SUPPORTED_VERSION_BUILD = 0; CEF_CHROMEELF_VERSION_MAJOR = CEF_SUPPORTED_VERSION_MAJOR; CEF_CHROMEELF_VERSION_MINOR = 0; - CEF_CHROMEELF_VERSION_RELEASE = 6045; - CEF_CHROMEELF_VERSION_BUILD = 199; + CEF_CHROMEELF_VERSION_RELEASE = 6099; + CEF_CHROMEELF_VERSION_BUILD = 109; diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index afd57e22..f6477243 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,9 +2,9 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 545, + "InternalVersion" : 546, "Name" : "cef4delphi_lazarus.lpk", - "Version" : "119.4.7" + "Version" : "120.1.8" } ], "UpdatePackageData" : {