Upgrade CEF to 3.3029.1611.g44e39a8 / Chromium 58.0.3029.81.

[casparcg] / dependencies64 / cef / linux / include / cef_jsdialog_handler.h

diff --git a/dependencies64/cef/include/cef_jsdialog_handler.h b/dependencies64/cef/linux/include/cef_jsdialog_handler.h
similarity index 89%
rename from dependencies64/cef/include/cef_jsdialog_handler.h
rename to dependencies64/cef/linux/include/cef_jsdialog_handler.h
index 419ba13d01b6b660a224325f71acd8880530b73f..4596430cc543176de80b32f87acd9112ddc24993 100644 (file)
--- a/dependencies64/cef/include/cef_jsdialog_handler.h
+++ b/dependencies64/cef/linux/include/cef_jsdialog_handler.h
@@ -46,7 +46,7 @@
 // requests.
 ///
 /*--cef(source=library)--*/
-class CefJSDialogCallback : public virtual CefBase {
+class CefJSDialogCallback : public virtual CefBaseRefCounted {
  public:
   ///
   // Continue the JS dialog request. Set |success| to true if the OK button was
@@ -63,15 +63,17 @@ class CefJSDialogCallback : public virtual CefBase {
 // methods of this class will be called on the UI thread.
 ///
 /*--cef(source=client)--*/
-class CefJSDialogHandler : public virtual CefBase {
+class CefJSDialogHandler : public virtual CefBaseRefCounted {
  public:
   typedef cef_jsdialog_type_t JSDialogType;
 
   ///
-  // Called to run a JavaScript dialog. The |default_prompt_text| value will be
+  // Called to run a JavaScript dialog. If |origin_url| is non-empty it can be
+  // passed to the CefFormatUrlForSecurityDisplay function to retrieve a secure
+  // and user-friendly display string. The |default_prompt_text| value will be
   // specified for prompt dialogs only. Set |suppress_message| to true and
-  // return false to suppress the message (suppressing messages is preferable
-  // to immediately executing the callback as this is used to detect presumably
+  // return false to suppress the message (suppressing messages is preferable to
+  // immediately executing the callback as this is used to detect presumably
   // malicious behavior like spamming alert messages in onbeforeunload). Set
   // |suppress_message| to false and return false to use the default
   // implementation (the default implementation will show one modal dialog at a
@@ -81,11 +83,10 @@ class CefJSDialogHandler : public virtual CefBase {
   // modal or modeless. If a custom dialog is used the application must execute
   // |callback| once the custom dialog is dismissed.
   ///
-  /*--cef(optional_param=accept_lang,optional_param=message_text,
-          optional_param=default_prompt_text)--*/
+  /*--cef(optional_param=origin_url,optional_param=accept_lang,
+          optional_param=message_text,optional_param=default_prompt_text)--*/
   virtual bool OnJSDialog(CefRefPtr<CefBrowser> browser,
                           const CefString& origin_url,
-                          const CefString& accept_lang,
                           JSDialogType dialog_type,
                           const CefString& message_text,
                           const CefString& default_prompt_text,