chrome: Support usage of the Chrome toolbar from Views (see issue #2969)

2025-06-05 21:39:12 +02:00 · 2021-04-11 16:10:11 -04:00
parent 9c82785077
commit a4603c6f1a
55 changed files with 1057 additions and 156 deletions
--- a/libcef_dll/ctocpp/views/browser_view_ctocpp.cc
+++ b/libcef_dll/ctocpp/views/browser_view_ctocpp.cc
@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=60dd60fe326607167c50e97f55a673151c1dcc69$
+// $hash=912a0807db8bc1405188d61961545cc8e540aacf$
 //

 #include "libcef_dll/ctocpp/views/browser_view_ctocpp.h"
@ -93,6 +93,23 @@ CefRefPtr<CefBrowser> CefBrowserViewCToCpp::GetBrowser() {
  return CefBrowserCToCpp::Wrap(_retval);
 }

+NO_SANITIZE("cfi-icall")
+CefRefPtr<CefView> CefBrowserViewCToCpp::GetChromeToolbar() {
+  shutdown_checker::AssertNotShutdown();
+
+  cef_browser_view_t* _struct = GetStruct();
+  if (CEF_MEMBER_MISSING(_struct, get_chrome_toolbar))
+    return nullptr;
+
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  // Execute
+  cef_view_t* _retval = _struct->get_chrome_toolbar(_struct);
+
+  // Return type: refptr_same
+  return CefViewCToCpp::Wrap(_retval);
+}
+
 NO_SANITIZE("cfi-icall")
 void CefBrowserViewCToCpp::SetPreferAccelerators(bool prefer_accelerators) {
  shutdown_checker::AssertNotShutdown();
--- a/libcef_dll/ctocpp/views/browser_view_ctocpp.h
+++ b/libcef_dll/ctocpp/views/browser_view_ctocpp.h
@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=b9bb98216be4ad0a91215e146dfd330ebe790721$
+// $hash=f17d395c61d650a824016d14bc06d0cb9db9a6e6$
 //

 #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_BROWSER_VIEW_CTOCPP_H_
@ -35,6 +35,7 @@ class CefBrowserViewCToCpp : public CefCToCppRefCounted<CefBrowserViewCToCpp,

  // CefBrowserView methods.
  CefRefPtr<CefBrowser> GetBrowser() OVERRIDE;
+  CefRefPtr<CefView> GetChromeToolbar() OVERRIDE;
  void SetPreferAccelerators(bool prefer_accelerators) OVERRIDE;

  // CefView methods.
--- a/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.cc
+++ b/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.cc
@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=902dae801096930c473e8cd7c86945fc0e703a98$
+// $hash=9aed01b6014f1c22815e7847eba321d75dbfa45d$
 //

 #include "libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.h"
@ -75,11 +75,12 @@ void CefBrowserViewDelegateCToCpp::OnBrowserDestroyed(
 }

 NO_SANITIZE("cfi-icall")
-CefRefPtr<CefBrowserViewDelegate> CefBrowserViewDelegateCToCpp::
-    GetDelegateForPopupBrowserView(CefRefPtr<CefBrowserView> browser_view,
-                                   const CefBrowserSettings& settings,
-                                   CefRefPtr<CefClient> client,
-                                   bool is_devtools) {
+CefRefPtr<CefBrowserViewDelegate>
+CefBrowserViewDelegateCToCpp::GetDelegateForPopupBrowserView(
+    CefRefPtr<CefBrowserView> browser_view,
+    const CefBrowserSettings& settings,
+    CefRefPtr<CefClient> client,
+    bool is_devtools) {
  shutdown_checker::AssertNotShutdown();

  cef_browser_view_delegate_t* _struct = GetStruct();
@ -139,8 +140,26 @@ bool CefBrowserViewDelegateCToCpp::OnPopupBrowserViewCreated(
 }

 NO_SANITIZE("cfi-icall")
-CefSize
-    CefBrowserViewDelegateCToCpp::GetPreferredSize(CefRefPtr<CefView> view) {
+CefBrowserViewDelegate::ChromeToolbarType
+CefBrowserViewDelegateCToCpp::GetChromeToolbarType() {
+  shutdown_checker::AssertNotShutdown();
+
+  cef_browser_view_delegate_t* _struct = GetStruct();
+  if (CEF_MEMBER_MISSING(_struct, get_chrome_toolbar_type))
+    return CEF_CTT_NONE;
+
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  // Execute
+  cef_chrome_toolbar_type_t _retval = _struct->get_chrome_toolbar_type(_struct);
+
+  // Return type: simple
+  return _retval;
+}
+
+NO_SANITIZE("cfi-icall")
+CefSize CefBrowserViewDelegateCToCpp::GetPreferredSize(
+    CefRefPtr<CefView> view) {
  shutdown_checker::AssertNotShutdown();

  cef_view_delegate_t* _struct =
@ -292,6 +311,27 @@ void CefBrowserViewDelegateCToCpp::OnChildViewChanged(
                                 CefViewCppToC::Wrap(child));
 }

+NO_SANITIZE("cfi-icall")
+void CefBrowserViewDelegateCToCpp::OnWindowChanged(CefRefPtr<CefView> view,
+                                                   bool added) {
+  shutdown_checker::AssertNotShutdown();
+
+  cef_view_delegate_t* _struct =
+      reinterpret_cast<cef_view_delegate_t*>(GetStruct());
+  if (CEF_MEMBER_MISSING(_struct, on_window_changed))
+    return;
+
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  // Verify param: view; type: refptr_diff
+  DCHECK(view.get());
+  if (!view.get())
+    return;
+
+  // Execute
+  _struct->on_window_changed(_struct, CefViewCppToC::Wrap(view), added);
+}
+
 NO_SANITIZE("cfi-icall")
 void CefBrowserViewDelegateCToCpp::OnFocus(CefRefPtr<CefView> view) {
  shutdown_checker::AssertNotShutdown();
--- a/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.h
+++ b/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.h
@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=83b4092b1523348b483a411ad80d64fa8b9db63d$
+// $hash=20b067cabc4baa4c9edecaffb38a2ebb28524ccc$
 //

 #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_BROWSER_VIEW_DELEGATE_CTOCPP_H_
@ -51,6 +51,7 @@ class CefBrowserViewDelegateCToCpp
  bool OnPopupBrowserViewCreated(CefRefPtr<CefBrowserView> browser_view,
                                 CefRefPtr<CefBrowserView> popup_browser_view,
                                 bool is_devtools) override;
+  ChromeToolbarType GetChromeToolbarType() override;

  // CefViewDelegate methods.
  CefSize GetPreferredSize(CefRefPtr<CefView> view) override;
@ -63,6 +64,7 @@ class CefBrowserViewDelegateCToCpp
  void OnChildViewChanged(CefRefPtr<CefView> view,
                          bool added,
                          CefRefPtr<CefView> child) override;
+  void OnWindowChanged(CefRefPtr<CefView> view, bool added) override;
  void OnFocus(CefRefPtr<CefView> view) override;
  void OnBlur(CefRefPtr<CefView> view) override;
 };
--- a/libcef_dll/ctocpp/views/button_delegate_ctocpp.cc
+++ b/libcef_dll/ctocpp/views/button_delegate_ctocpp.cc
@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=3dcc24823032b36d6566eea42fd3ccdcee286e92$
+// $hash=fc962d2832eeb3dee99e9a201f234d4a4b4d6f0f$
 //

 #include "libcef_dll/ctocpp/views/button_delegate_ctocpp.h"
@ -210,6 +210,27 @@ void CefButtonDelegateCToCpp::OnChildViewChanged(CefRefPtr<CefView> view,
                                 CefViewCppToC::Wrap(child));
 }

+NO_SANITIZE("cfi-icall")
+void CefButtonDelegateCToCpp::OnWindowChanged(CefRefPtr<CefView> view,
+                                              bool added) {
+  shutdown_checker::AssertNotShutdown();
+
+  cef_view_delegate_t* _struct =
+      reinterpret_cast<cef_view_delegate_t*>(GetStruct());
+  if (CEF_MEMBER_MISSING(_struct, on_window_changed))
+    return;
+
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  // Verify param: view; type: refptr_diff
+  DCHECK(view.get());
+  if (!view.get())
+    return;
+
+  // Execute
+  _struct->on_window_changed(_struct, CefViewCppToC::Wrap(view), added);
+}
+
 NO_SANITIZE("cfi-icall")
 void CefButtonDelegateCToCpp::OnFocus(CefRefPtr<CefView> view) {
  shutdown_checker::AssertNotShutdown();
--- a/libcef_dll/ctocpp/views/button_delegate_ctocpp.h
+++ b/libcef_dll/ctocpp/views/button_delegate_ctocpp.h
@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=532ee88167e55b11e3bce9330b93f33fa382e24a$
+// $hash=6a72a71a9becd6103d44719ed88b000d576d95eb$
 //

 #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_BUTTON_DELEGATE_CTOCPP_H_
@ -51,6 +51,7 @@ class CefButtonDelegateCToCpp
  void OnChildViewChanged(CefRefPtr<CefView> view,
                          bool added,
                          CefRefPtr<CefView> child) override;
+  void OnWindowChanged(CefRefPtr<CefView> view, bool added) override;
  void OnFocus(CefRefPtr<CefView> view) override;
  void OnBlur(CefRefPtr<CefView> view) override;
 };
--- a/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.cc
+++ b/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.cc
@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=c4cdaa3fa15fb7559a199e37448fec7fe9d81711$
+// $hash=9ecd07954f90dc14ddf36072285c942f2ee8082f$
 //

 #include "libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.h"
@ -242,6 +242,27 @@ void CefMenuButtonDelegateCToCpp::OnChildViewChanged(CefRefPtr<CefView> view,
                                 CefViewCppToC::Wrap(child));
 }

+NO_SANITIZE("cfi-icall")
+void CefMenuButtonDelegateCToCpp::OnWindowChanged(CefRefPtr<CefView> view,
+                                                  bool added) {
+  shutdown_checker::AssertNotShutdown();
+
+  cef_view_delegate_t* _struct =
+      reinterpret_cast<cef_view_delegate_t*>(GetStruct());
+  if (CEF_MEMBER_MISSING(_struct, on_window_changed))
+    return;
+
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  // Verify param: view; type: refptr_diff
+  DCHECK(view.get());
+  if (!view.get())
+    return;
+
+  // Execute
+  _struct->on_window_changed(_struct, CefViewCppToC::Wrap(view), added);
+}
+
 NO_SANITIZE("cfi-icall")
 void CefMenuButtonDelegateCToCpp::OnFocus(CefRefPtr<CefView> view) {
  shutdown_checker::AssertNotShutdown();
--- a/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.h
+++ b/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.h
@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=1bbd5144528b748527fb1ef3fe49e29e84a642de$
+// $hash=7836ec7b53349057b1d1d75c6ba8506620bed53d$
 //

 #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_MENU_BUTTON_DELEGATE_CTOCPP_H_
@ -57,6 +57,7 @@ class CefMenuButtonDelegateCToCpp
  void OnChildViewChanged(CefRefPtr<CefView> view,
                          bool added,
                          CefRefPtr<CefView> child) override;
+  void OnWindowChanged(CefRefPtr<CefView> view, bool added) override;
  void OnFocus(CefRefPtr<CefView> view) override;
  void OnBlur(CefRefPtr<CefView> view) override;
 };
--- a/libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc
+++ b/libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc
@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=785b996793338a2ac1918b48d2046954c58a6237$
+// $hash=4bffffc0fe09523839a08109aef1e3de90f6e25c$
 //

 #include "libcef_dll/ctocpp/views/panel_delegate_ctocpp.h"
@ -170,6 +170,27 @@ void CefPanelDelegateCToCpp::OnChildViewChanged(CefRefPtr<CefView> view,
                                 CefViewCppToC::Wrap(child));
 }

+NO_SANITIZE("cfi-icall")
+void CefPanelDelegateCToCpp::OnWindowChanged(CefRefPtr<CefView> view,
+                                             bool added) {
+  shutdown_checker::AssertNotShutdown();
+
+  cef_view_delegate_t* _struct =
+      reinterpret_cast<cef_view_delegate_t*>(GetStruct());
+  if (CEF_MEMBER_MISSING(_struct, on_window_changed))
+    return;
+
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  // Verify param: view; type: refptr_diff
+  DCHECK(view.get());
+  if (!view.get())
+    return;
+
+  // Execute
+  _struct->on_window_changed(_struct, CefViewCppToC::Wrap(view), added);
+}
+
 NO_SANITIZE("cfi-icall")
 void CefPanelDelegateCToCpp::OnFocus(CefRefPtr<CefView> view) {
  shutdown_checker::AssertNotShutdown();
--- a/libcef_dll/ctocpp/views/panel_delegate_ctocpp.h
+++ b/libcef_dll/ctocpp/views/panel_delegate_ctocpp.h
@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=88ff4d04d59ca5e3b5add12c0360750844f0263f$
+// $hash=d508126f22cba29931a4d53aecbdaaca7dd39b9d$
 //

 #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_PANEL_DELEGATE_CTOCPP_H_
@ -47,6 +47,7 @@ class CefPanelDelegateCToCpp
  void OnChildViewChanged(CefRefPtr<CefView> view,
                          bool added,
                          CefRefPtr<CefView> child) override;
+  void OnWindowChanged(CefRefPtr<CefView> view, bool added) override;
  void OnFocus(CefRefPtr<CefView> view) override;
  void OnBlur(CefRefPtr<CefView> view) override;
 };
--- a/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.cc
+++ b/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.cc
@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=042f9e7c31678915a88af146b06a34c842a8796f$
+// $hash=8582eda62f90bab166d04bb6a2f8783a98fabe15$
 //

 #include "libcef_dll/ctocpp/views/textfield_delegate_ctocpp.h"
@ -215,6 +215,27 @@ void CefTextfieldDelegateCToCpp::OnChildViewChanged(CefRefPtr<CefView> view,
                                 CefViewCppToC::Wrap(child));
 }

+NO_SANITIZE("cfi-icall")
+void CefTextfieldDelegateCToCpp::OnWindowChanged(CefRefPtr<CefView> view,
+                                                 bool added) {
+  shutdown_checker::AssertNotShutdown();
+
+  cef_view_delegate_t* _struct =
+      reinterpret_cast<cef_view_delegate_t*>(GetStruct());
+  if (CEF_MEMBER_MISSING(_struct, on_window_changed))
+    return;
+
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  // Verify param: view; type: refptr_diff
+  DCHECK(view.get());
+  if (!view.get())
+    return;
+
+  // Execute
+  _struct->on_window_changed(_struct, CefViewCppToC::Wrap(view), added);
+}
+
 NO_SANITIZE("cfi-icall")
 void CefTextfieldDelegateCToCpp::OnFocus(CefRefPtr<CefView> view) {
  shutdown_checker::AssertNotShutdown();
--- a/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.h
+++ b/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.h
@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=5e71b48999ec32b734dad95bfe8ce37e29a02537$
+// $hash=3a83b906a29ba302874b73804e457680d2b7251e$
 //

 #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_TEXTFIELD_DELEGATE_CTOCPP_H_
@ -52,6 +52,7 @@ class CefTextfieldDelegateCToCpp
  void OnChildViewChanged(CefRefPtr<CefView> view,
                          bool added,
                          CefRefPtr<CefView> child) override;
+  void OnWindowChanged(CefRefPtr<CefView> view, bool added) override;
  void OnFocus(CefRefPtr<CefView> view) override;
  void OnBlur(CefRefPtr<CefView> view) override;
 };
--- a/libcef_dll/ctocpp/views/view_delegate_ctocpp.cc
+++ b/libcef_dll/ctocpp/views/view_delegate_ctocpp.cc
@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=2d7b3c7d174f5669f039e25c93da73e6f29de471$
+// $hash=7a6d2ca91509c2e6c510d5c9585a74c2fe10499b$
 //

 #include "libcef_dll/ctocpp/views/view_delegate_ctocpp.h"
@ -169,6 +169,26 @@ void CefViewDelegateCToCpp::OnChildViewChanged(CefRefPtr<CefView> view,
                                 CefViewCppToC::Wrap(child));
 }

+NO_SANITIZE("cfi-icall")
+void CefViewDelegateCToCpp::OnWindowChanged(CefRefPtr<CefView> view,
+                                            bool added) {
+  shutdown_checker::AssertNotShutdown();
+
+  cef_view_delegate_t* _struct = GetStruct();
+  if (CEF_MEMBER_MISSING(_struct, on_window_changed))
+    return;
+
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  // Verify param: view; type: refptr_diff
+  DCHECK(view.get());
+  if (!view.get())
+    return;
+
+  // Execute
+  _struct->on_window_changed(_struct, CefViewCppToC::Wrap(view), added);
+}
+
 NO_SANITIZE("cfi-icall")
 void CefViewDelegateCToCpp::OnFocus(CefRefPtr<CefView> view) {
  shutdown_checker::AssertNotShutdown();
--- a/libcef_dll/ctocpp/views/view_delegate_ctocpp.h
+++ b/libcef_dll/ctocpp/views/view_delegate_ctocpp.h
@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=ae050ad2368c8741e90ee0653f8bc6c6e1be4ad8$
+// $hash=f049a053042a00be15899439f324a376ee309dbb$
 //

 #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_VIEW_DELEGATE_CTOCPP_H_
@ -46,6 +46,7 @@ class CefViewDelegateCToCpp : public CefCToCppRefCounted<CefViewDelegateCToCpp,
  void OnChildViewChanged(CefRefPtr<CefView> view,
                          bool added,
                          CefRefPtr<CefView> child) override;
+  void OnWindowChanged(CefRefPtr<CefView> view, bool added) override;
  void OnFocus(CefRefPtr<CefView> view) override;
  void OnBlur(CefRefPtr<CefView> view) override;
 };
--- a/libcef_dll/ctocpp/views/window_delegate_ctocpp.cc
+++ b/libcef_dll/ctocpp/views/window_delegate_ctocpp.cc
@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=c15191d56329def4089fb5d3944e2991b55876ca$
+// $hash=dda345b957ac58c71770da1cf4813ce16ea568b8$
 //

 #include "libcef_dll/ctocpp/views/window_delegate_ctocpp.h"
@ -436,6 +436,27 @@ void CefWindowDelegateCToCpp::OnChildViewChanged(CefRefPtr<CefView> view,
                                 CefViewCppToC::Wrap(child));
 }

+NO_SANITIZE("cfi-icall")
+void CefWindowDelegateCToCpp::OnWindowChanged(CefRefPtr<CefView> view,
+                                              bool added) {
+  shutdown_checker::AssertNotShutdown();
+
+  cef_view_delegate_t* _struct =
+      reinterpret_cast<cef_view_delegate_t*>(GetStruct());
+  if (CEF_MEMBER_MISSING(_struct, on_window_changed))
+    return;
+
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  // Verify param: view; type: refptr_diff
+  DCHECK(view.get());
+  if (!view.get())
+    return;
+
+  // Execute
+  _struct->on_window_changed(_struct, CefViewCppToC::Wrap(view), added);
+}
+
 NO_SANITIZE("cfi-icall")
 void CefWindowDelegateCToCpp::OnFocus(CefRefPtr<CefView> view) {
  shutdown_checker::AssertNotShutdown();
--- a/libcef_dll/ctocpp/views/window_delegate_ctocpp.h
+++ b/libcef_dll/ctocpp/views/window_delegate_ctocpp.h
@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=22e538be2af31decaefcfc0b3e2879586530ad71$
+// $hash=4e5e470d6aa929b3b2d4286eb4bcdc90dba052dc$
 //

 #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_WINDOW_DELEGATE_CTOCPP_H_
@ -65,6 +65,7 @@ class CefWindowDelegateCToCpp
  void OnChildViewChanged(CefRefPtr<CefView> view,
                          bool added,
                          CefRefPtr<CefView> child) override;
+  void OnWindowChanged(CefRefPtr<CefView> view, bool added) override;
  void OnFocus(CefRefPtr<CefView> view) override;
  void OnBlur(CefRefPtr<CefView> view) override;
 };