Add CefPermissionHandler callbacks for permission prompts (see issue #3352)

libcef_dll/cpptoc/permission_handler_cpptoc.cc

@@ -9,13 +9,14 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=9c8d3c2295998f7a976967aa7f4b6a6da7c5c53d$
+// $hash=f137c0d7ae5fef1a6478f9416f6fe3d12a66d975$
 //
 
 #include "libcef_dll/cpptoc/permission_handler_cpptoc.h"
 #include "libcef_dll/ctocpp/browser_ctocpp.h"
 #include "libcef_dll/ctocpp/frame_ctocpp.h"
 #include "libcef_dll/ctocpp/media_access_callback_ctocpp.h"
+#include "libcef_dll/ctocpp/permission_prompt_callback_ctocpp.h"
 #include "libcef_dll/shutdown_checker.h"
 
 namespace {
@@ -26,7 +27,7 @@ int CEF_CALLBACK permission_handler_on_request_media_access_permission(
     struct _cef_permission_handler_t* self,
     cef_browser_t* browser,
     cef_frame_t* frame,
-    const cef_string_t* requesting_url,
+    const cef_string_t* requesting_origin,
     uint32 requested_permissions,
     cef_media_access_callback_t* callback) {
   shutdown_checker::AssertNotShutdown();
@@ -44,9 +45,9 @@ int CEF_CALLBACK permission_handler_on_request_media_access_permission(
   DCHECK(frame);
   if (!frame)
     return 0;
-  // Verify param: requesting_url; type: string_byref_const
-  DCHECK(requesting_url);
-  if (!requesting_url)
+  // Verify param: requesting_origin; type: string_byref_const
+  DCHECK(requesting_origin);
+  if (!requesting_origin)
     return 0;
   // Verify param: callback; type: refptr_diff
   DCHECK(callback);
@@ -57,13 +58,71 @@ int CEF_CALLBACK permission_handler_on_request_media_access_permission(
   bool _retval =
       CefPermissionHandlerCppToC::Get(self)->OnRequestMediaAccessPermission(
           CefBrowserCToCpp::Wrap(browser), CefFrameCToCpp::Wrap(frame),
-          CefString(requesting_url), requested_permissions,
+          CefString(requesting_origin), requested_permissions,
           CefMediaAccessCallbackCToCpp::Wrap(callback));
 
   // Return type: bool
   return _retval;
 }
 
+int CEF_CALLBACK permission_handler_on_show_permission_prompt(
+    struct _cef_permission_handler_t* self,
+    cef_browser_t* browser,
+    uint64 prompt_id,
+    const cef_string_t* requesting_origin,
+    uint32 requested_permissions,
+    cef_permission_prompt_callback_t* callback) {
+  shutdown_checker::AssertNotShutdown();
+
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
+  DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: requesting_origin; type: string_byref_const
+  DCHECK(requesting_origin);
+  if (!requesting_origin)
+    return 0;
+  // Verify param: callback; type: refptr_diff
+  DCHECK(callback);
+  if (!callback)
+    return 0;
+
+  // Execute
+  bool _retval = CefPermissionHandlerCppToC::Get(self)->OnShowPermissionPrompt(
+      CefBrowserCToCpp::Wrap(browser), prompt_id, CefString(requesting_origin),
+      requested_permissions, CefPermissionPromptCallbackCToCpp::Wrap(callback));
+
+  // Return type: bool
+  return _retval;
+}
+
+void CEF_CALLBACK permission_handler_on_dismiss_permission_prompt(
+    struct _cef_permission_handler_t* self,
+    cef_browser_t* browser,
+    uint64 prompt_id,
+    cef_permission_request_result_t result) {
+  shutdown_checker::AssertNotShutdown();
+
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
+  DCHECK(browser);
+  if (!browser)
+    return;
+
+  // Execute
+  CefPermissionHandlerCppToC::Get(self)->OnDismissPermissionPrompt(
+      CefBrowserCToCpp::Wrap(browser), prompt_id, result);
+}
+
 }  // namespace
 
 // CONSTRUCTOR - Do not edit by hand.
@@ -71,6 +130,10 @@ int CEF_CALLBACK permission_handler_on_request_media_access_permission(
 CefPermissionHandlerCppToC::CefPermissionHandlerCppToC() {
   GetStruct()->on_request_media_access_permission =
       permission_handler_on_request_media_access_permission;
+  GetStruct()->on_show_permission_prompt =
+      permission_handler_on_show_permission_prompt;
+  GetStruct()->on_dismiss_permission_prompt =
+      permission_handler_on_dismiss_permission_prompt;
 }
 
 // DESTRUCTOR - Do not edit by hand.

libcef_dll/cpptoc/permission_prompt_callback_cpptoc.cc

@@ -0,0 +1,66 @@
+// Copyright (c) 2022 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool. If making changes by
+// hand only do so within the body of existing method and function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+// $hash=e2297d672c66d4530e85d4c4761d1adeabe7134c$
+//
+
+#include "libcef_dll/cpptoc/permission_prompt_callback_cpptoc.h"
+#include "libcef_dll/shutdown_checker.h"
+
+namespace {
+
+// MEMBER FUNCTIONS - Body may be edited by hand.
+
+void CEF_CALLBACK
+permission_prompt_callback_cont(struct _cef_permission_prompt_callback_t* self,
+                                cef_permission_request_result_t result) {
+  shutdown_checker::AssertNotShutdown();
+
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return;
+
+  // Execute
+  CefPermissionPromptCallbackCppToC::Get(self)->Continue(result);
+}
+
+}  // namespace
+
+// CONSTRUCTOR - Do not edit by hand.
+
+CefPermissionPromptCallbackCppToC::CefPermissionPromptCallbackCppToC() {
+  GetStruct()->cont = permission_prompt_callback_cont;
+}
+
+// DESTRUCTOR - Do not edit by hand.
+
+CefPermissionPromptCallbackCppToC::~CefPermissionPromptCallbackCppToC() {
+  shutdown_checker::AssertNotShutdown();
+}
+
+template <>
+CefRefPtr<CefPermissionPromptCallback>
+CefCppToCRefCounted<CefPermissionPromptCallbackCppToC,
+                    CefPermissionPromptCallback,
+                    cef_permission_prompt_callback_t>::
+    UnwrapDerived(CefWrapperType type, cef_permission_prompt_callback_t* s) {
+  NOTREACHED() << "Unexpected class type: " << type;
+  return nullptr;
+}
+
+template <>
+CefWrapperType
+    CefCppToCRefCounted<CefPermissionPromptCallbackCppToC,
+                        CefPermissionPromptCallback,
+                        cef_permission_prompt_callback_t>::kWrapperType =
+        WT_PERMISSION_PROMPT_CALLBACK;

libcef_dll/cpptoc/permission_prompt_callback_cpptoc.h

@@ -0,0 +1,38 @@
+// Copyright (c) 2022 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool. If making changes by
+// hand only do so within the body of existing method and function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+// $hash=03956400a2d9931dd114105e8512b8e87d31f305$
+//
+
+#ifndef CEF_LIBCEF_DLL_CPPTOC_PERMISSION_PROMPT_CALLBACK_CPPTOC_H_
+#define CEF_LIBCEF_DLL_CPPTOC_PERMISSION_PROMPT_CALLBACK_CPPTOC_H_
+#pragma once
+
+#if !defined(BUILDING_CEF_SHARED)
+#error This file can be included DLL-side only
+#endif
+
+#include "include/capi/cef_permission_handler_capi.h"
+#include "include/cef_permission_handler.h"
+#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
+
+// Wrap a C++ class with a C structure.
+// This class may be instantiated and accessed DLL-side only.
+class CefPermissionPromptCallbackCppToC
+    : public CefCppToCRefCounted<CefPermissionPromptCallbackCppToC,
+                                 CefPermissionPromptCallback,
+                                 cef_permission_prompt_callback_t> {
+ public:
+  CefPermissionPromptCallbackCppToC();
+  virtual ~CefPermissionPromptCallbackCppToC();
+};
+
+#endif  // CEF_LIBCEF_DLL_CPPTOC_PERMISSION_PROMPT_CALLBACK_CPPTOC_H_