mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
chrome: Support usage of the Chrome toolbar from Views (see issue #2969)
This commit is contained in:
@ -9,7 +9,7 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=d69aae0b968db9610e29d956d629f1789eca922d$
|
||||
// $hash=312985bb5cc971d1fe9d77af1f985f6a544e9db5$
|
||||
//
|
||||
|
||||
#include "libcef_dll/cpptoc/views/browser_view_cpptoc.h"
|
||||
@ -102,6 +102,24 @@ browser_view_get_browser(struct _cef_browser_view_t* self) {
|
||||
return CefBrowserCppToC::Wrap(_retval);
|
||||
}
|
||||
|
||||
struct _cef_view_t* CEF_CALLBACK
|
||||
browser_view_get_chrome_toolbar(struct _cef_browser_view_t* self) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
DCHECK(self);
|
||||
if (!self)
|
||||
return NULL;
|
||||
|
||||
// Execute
|
||||
CefRefPtr<CefView> _retval =
|
||||
CefBrowserViewCppToC::Get(self)->GetChromeToolbar();
|
||||
|
||||
// Return type: refptr_same
|
||||
return CefViewCppToC::Wrap(_retval);
|
||||
}
|
||||
|
||||
void CEF_CALLBACK
|
||||
browser_view_set_prefer_accelerators(struct _cef_browser_view_t* self,
|
||||
int prefer_accelerators) {
|
||||
@ -1075,6 +1093,7 @@ int CEF_CALLBACK browser_view_convert_point_from_view(struct _cef_view_t* self,
|
||||
|
||||
CefBrowserViewCppToC::CefBrowserViewCppToC() {
|
||||
GetStruct()->get_browser = browser_view_get_browser;
|
||||
GetStruct()->get_chrome_toolbar = browser_view_get_chrome_toolbar;
|
||||
GetStruct()->set_prefer_accelerators = browser_view_set_prefer_accelerators;
|
||||
GetStruct()->base.as_browser_view = browser_view_as_browser_view;
|
||||
GetStruct()->base.as_button = browser_view_as_button;
|
||||
|
@ -9,7 +9,7 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=dceaf28fbed0456dce3c34fcbc8177f3c2537cec$
|
||||
// $hash=8e8daae6a8ed718582045ea42e16906813b77337$
|
||||
//
|
||||
|
||||
#include "libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.h"
|
||||
@ -149,6 +149,25 @@ int CEF_CALLBACK browser_view_delegate_on_popup_browser_view_created(
|
||||
return _retval;
|
||||
}
|
||||
|
||||
cef_chrome_toolbar_type_t CEF_CALLBACK
|
||||
browser_view_delegate_get_chrome_toolbar_type(
|
||||
struct _cef_browser_view_delegate_t* self) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
DCHECK(self);
|
||||
if (!self)
|
||||
return CEF_CTT_NONE;
|
||||
|
||||
// Execute
|
||||
cef_chrome_toolbar_type_t _retval =
|
||||
CefBrowserViewDelegateCppToC::Get(self)->GetChromeToolbarType();
|
||||
|
||||
// Return type: simple
|
||||
return _retval;
|
||||
}
|
||||
|
||||
cef_size_t CEF_CALLBACK
|
||||
browser_view_delegate_get_preferred_size(struct _cef_view_delegate_t* self,
|
||||
cef_view_t* view) {
|
||||
@ -302,6 +321,28 @@ browser_view_delegate_on_child_view_changed(struct _cef_view_delegate_t* self,
|
||||
CefViewCToCpp::Wrap(child));
|
||||
}
|
||||
|
||||
void CEF_CALLBACK
|
||||
browser_view_delegate_on_window_changed(struct _cef_view_delegate_t* self,
|
||||
cef_view_t* view,
|
||||
int added) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
DCHECK(self);
|
||||
if (!self)
|
||||
return;
|
||||
// Verify param: view; type: refptr_diff
|
||||
DCHECK(view);
|
||||
if (!view)
|
||||
return;
|
||||
|
||||
// Execute
|
||||
CefBrowserViewDelegateCppToC::Get(
|
||||
reinterpret_cast<cef_browser_view_delegate_t*>(self))
|
||||
->OnWindowChanged(CefViewCToCpp::Wrap(view), added ? true : false);
|
||||
}
|
||||
|
||||
void CEF_CALLBACK
|
||||
browser_view_delegate_on_focus(struct _cef_view_delegate_t* self,
|
||||
cef_view_t* view) {
|
||||
@ -356,6 +397,8 @@ CefBrowserViewDelegateCppToC::CefBrowserViewDelegateCppToC() {
|
||||
browser_view_delegate_get_delegate_for_popup_browser_view;
|
||||
GetStruct()->on_popup_browser_view_created =
|
||||
browser_view_delegate_on_popup_browser_view_created;
|
||||
GetStruct()->get_chrome_toolbar_type =
|
||||
browser_view_delegate_get_chrome_toolbar_type;
|
||||
GetStruct()->base.get_preferred_size =
|
||||
browser_view_delegate_get_preferred_size;
|
||||
GetStruct()->base.get_minimum_size = browser_view_delegate_get_minimum_size;
|
||||
@ -366,6 +409,7 @@ CefBrowserViewDelegateCppToC::CefBrowserViewDelegateCppToC() {
|
||||
browser_view_delegate_on_parent_view_changed;
|
||||
GetStruct()->base.on_child_view_changed =
|
||||
browser_view_delegate_on_child_view_changed;
|
||||
GetStruct()->base.on_window_changed = browser_view_delegate_on_window_changed;
|
||||
GetStruct()->base.on_focus = browser_view_delegate_on_focus;
|
||||
GetStruct()->base.on_blur = browser_view_delegate_on_blur;
|
||||
}
|
||||
|
@ -9,7 +9,7 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=0fa0f3d240a017c67e65fc7e965c9b8c61e64649$
|
||||
// $hash=52a0deb8b7ae62e474acb1474cf922c3e9a04f14$
|
||||
//
|
||||
|
||||
#include "libcef_dll/cpptoc/views/button_delegate_cpptoc.h"
|
||||
@ -213,6 +213,27 @@ button_delegate_on_child_view_changed(struct _cef_view_delegate_t* self,
|
||||
CefViewCToCpp::Wrap(child));
|
||||
}
|
||||
|
||||
void CEF_CALLBACK
|
||||
button_delegate_on_window_changed(struct _cef_view_delegate_t* self,
|
||||
cef_view_t* view,
|
||||
int added) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
DCHECK(self);
|
||||
if (!self)
|
||||
return;
|
||||
// Verify param: view; type: refptr_diff
|
||||
DCHECK(view);
|
||||
if (!view)
|
||||
return;
|
||||
|
||||
// Execute
|
||||
CefButtonDelegateCppToC::Get(reinterpret_cast<cef_button_delegate_t*>(self))
|
||||
->OnWindowChanged(CefViewCToCpp::Wrap(view), added ? true : false);
|
||||
}
|
||||
|
||||
void CEF_CALLBACK button_delegate_on_focus(struct _cef_view_delegate_t* self,
|
||||
cef_view_t* view) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
@ -267,6 +288,7 @@ CefButtonDelegateCppToC::CefButtonDelegateCppToC() {
|
||||
button_delegate_on_parent_view_changed;
|
||||
GetStruct()->base.on_child_view_changed =
|
||||
button_delegate_on_child_view_changed;
|
||||
GetStruct()->base.on_window_changed = button_delegate_on_window_changed;
|
||||
GetStruct()->base.on_focus = button_delegate_on_focus;
|
||||
GetStruct()->base.on_blur = button_delegate_on_blur;
|
||||
}
|
||||
|
@ -9,7 +9,7 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=8c598c348857748e3eca7629326f2eff46e7c06c$
|
||||
// $hash=2fcd1d4d2126285209e1fa782beccbb363693bf3$
|
||||
//
|
||||
|
||||
#include "libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.h"
|
||||
@ -252,6 +252,28 @@ menu_button_delegate_on_child_view_changed(struct _cef_view_delegate_t* self,
|
||||
CefViewCToCpp::Wrap(child));
|
||||
}
|
||||
|
||||
void CEF_CALLBACK
|
||||
menu_button_delegate_on_window_changed(struct _cef_view_delegate_t* self,
|
||||
cef_view_t* view,
|
||||
int added) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
DCHECK(self);
|
||||
if (!self)
|
||||
return;
|
||||
// Verify param: view; type: refptr_diff
|
||||
DCHECK(view);
|
||||
if (!view)
|
||||
return;
|
||||
|
||||
// Execute
|
||||
CefMenuButtonDelegateCppToC::Get(
|
||||
reinterpret_cast<cef_menu_button_delegate_t*>(self))
|
||||
->OnWindowChanged(CefViewCToCpp::Wrap(view), added ? true : false);
|
||||
}
|
||||
|
||||
void CEF_CALLBACK
|
||||
menu_button_delegate_on_focus(struct _cef_view_delegate_t* self,
|
||||
cef_view_t* view) {
|
||||
@ -316,6 +338,8 @@ CefMenuButtonDelegateCppToC::CefMenuButtonDelegateCppToC() {
|
||||
menu_button_delegate_on_parent_view_changed;
|
||||
GetStruct()->base.base.on_child_view_changed =
|
||||
menu_button_delegate_on_child_view_changed;
|
||||
GetStruct()->base.base.on_window_changed =
|
||||
menu_button_delegate_on_window_changed;
|
||||
GetStruct()->base.base.on_focus = menu_button_delegate_on_focus;
|
||||
GetStruct()->base.base.on_blur = menu_button_delegate_on_blur;
|
||||
}
|
||||
|
@ -9,7 +9,7 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=e3a1c9fc1175aef66bd4f2c2c9a11263502977ff$
|
||||
// $hash=dd29f2990766a766a27dece7e39501eb11a296fd$
|
||||
//
|
||||
|
||||
#include "libcef_dll/cpptoc/views/panel_delegate_cpptoc.h"
|
||||
@ -172,6 +172,27 @@ panel_delegate_on_child_view_changed(struct _cef_view_delegate_t* self,
|
||||
CefViewCToCpp::Wrap(child));
|
||||
}
|
||||
|
||||
void CEF_CALLBACK
|
||||
panel_delegate_on_window_changed(struct _cef_view_delegate_t* self,
|
||||
cef_view_t* view,
|
||||
int added) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
DCHECK(self);
|
||||
if (!self)
|
||||
return;
|
||||
// Verify param: view; type: refptr_diff
|
||||
DCHECK(view);
|
||||
if (!view)
|
||||
return;
|
||||
|
||||
// Execute
|
||||
CefPanelDelegateCppToC::Get(reinterpret_cast<cef_panel_delegate_t*>(self))
|
||||
->OnWindowChanged(CefViewCToCpp::Wrap(view), added ? true : false);
|
||||
}
|
||||
|
||||
void CEF_CALLBACK panel_delegate_on_focus(struct _cef_view_delegate_t* self,
|
||||
cef_view_t* view) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
@ -223,6 +244,7 @@ CefPanelDelegateCppToC::CefPanelDelegateCppToC() {
|
||||
panel_delegate_on_parent_view_changed;
|
||||
GetStruct()->base.on_child_view_changed =
|
||||
panel_delegate_on_child_view_changed;
|
||||
GetStruct()->base.on_window_changed = panel_delegate_on_window_changed;
|
||||
GetStruct()->base.on_focus = panel_delegate_on_focus;
|
||||
GetStruct()->base.on_blur = panel_delegate_on_blur;
|
||||
}
|
||||
|
@ -9,7 +9,7 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=2762af8abc72d877fd2a44a07701861face6013d$
|
||||
// $hash=e35b635ec442c8910b02aca64d48760b1360c868$
|
||||
//
|
||||
|
||||
#include "libcef_dll/cpptoc/views/textfield_delegate_cpptoc.h"
|
||||
@ -227,6 +227,28 @@ textfield_delegate_on_child_view_changed(struct _cef_view_delegate_t* self,
|
||||
CefViewCToCpp::Wrap(child));
|
||||
}
|
||||
|
||||
void CEF_CALLBACK
|
||||
textfield_delegate_on_window_changed(struct _cef_view_delegate_t* self,
|
||||
cef_view_t* view,
|
||||
int added) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
DCHECK(self);
|
||||
if (!self)
|
||||
return;
|
||||
// Verify param: view; type: refptr_diff
|
||||
DCHECK(view);
|
||||
if (!view)
|
||||
return;
|
||||
|
||||
// Execute
|
||||
CefTextfieldDelegateCppToC::Get(
|
||||
reinterpret_cast<cef_textfield_delegate_t*>(self))
|
||||
->OnWindowChanged(CefViewCToCpp::Wrap(view), added ? true : false);
|
||||
}
|
||||
|
||||
void CEF_CALLBACK textfield_delegate_on_focus(struct _cef_view_delegate_t* self,
|
||||
cef_view_t* view) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
@ -283,6 +305,7 @@ CefTextfieldDelegateCppToC::CefTextfieldDelegateCppToC() {
|
||||
textfield_delegate_on_parent_view_changed;
|
||||
GetStruct()->base.on_child_view_changed =
|
||||
textfield_delegate_on_child_view_changed;
|
||||
GetStruct()->base.on_window_changed = textfield_delegate_on_window_changed;
|
||||
GetStruct()->base.on_focus = textfield_delegate_on_focus;
|
||||
GetStruct()->base.on_blur = textfield_delegate_on_blur;
|
||||
}
|
||||
|
@ -9,7 +9,7 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=918764cb2b4346405ddfb1f4eeb26f3042d93bb9$
|
||||
// $hash=7c6283658d49420281d02b4793f65f478f261461$
|
||||
//
|
||||
|
||||
#include "libcef_dll/cpptoc/views/view_delegate_cpptoc.h"
|
||||
@ -173,6 +173,27 @@ view_delegate_on_child_view_changed(struct _cef_view_delegate_t* self,
|
||||
CefViewCToCpp::Wrap(child));
|
||||
}
|
||||
|
||||
void CEF_CALLBACK
|
||||
view_delegate_on_window_changed(struct _cef_view_delegate_t* self,
|
||||
cef_view_t* view,
|
||||
int added) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
DCHECK(self);
|
||||
if (!self)
|
||||
return;
|
||||
// Verify param: view; type: refptr_diff
|
||||
DCHECK(view);
|
||||
if (!view)
|
||||
return;
|
||||
|
||||
// Execute
|
||||
CefViewDelegateCppToC::Get(self)->OnWindowChanged(CefViewCToCpp::Wrap(view),
|
||||
added ? true : false);
|
||||
}
|
||||
|
||||
void CEF_CALLBACK view_delegate_on_focus(struct _cef_view_delegate_t* self,
|
||||
cef_view_t* view) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
@ -220,6 +241,7 @@ CefViewDelegateCppToC::CefViewDelegateCppToC() {
|
||||
GetStruct()->get_height_for_width = view_delegate_get_height_for_width;
|
||||
GetStruct()->on_parent_view_changed = view_delegate_on_parent_view_changed;
|
||||
GetStruct()->on_child_view_changed = view_delegate_on_child_view_changed;
|
||||
GetStruct()->on_window_changed = view_delegate_on_window_changed;
|
||||
GetStruct()->on_focus = view_delegate_on_focus;
|
||||
GetStruct()->on_blur = view_delegate_on_blur;
|
||||
}
|
||||
|
@ -9,7 +9,7 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=041bb67146f8e803a9eeb7790528441f2f8ceb28$
|
||||
// $hash=a201b988556a825fffe39f58e378664b93795c72$
|
||||
//
|
||||
|
||||
#include "libcef_dll/cpptoc/views/window_delegate_cpptoc.h"
|
||||
@ -452,6 +452,27 @@ window_delegate_on_child_view_changed(struct _cef_view_delegate_t* self,
|
||||
CefViewCToCpp::Wrap(child));
|
||||
}
|
||||
|
||||
void CEF_CALLBACK
|
||||
window_delegate_on_window_changed(struct _cef_view_delegate_t* self,
|
||||
cef_view_t* view,
|
||||
int added) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
DCHECK(self);
|
||||
if (!self)
|
||||
return;
|
||||
// Verify param: view; type: refptr_diff
|
||||
DCHECK(view);
|
||||
if (!view)
|
||||
return;
|
||||
|
||||
// Execute
|
||||
CefWindowDelegateCppToC::Get(reinterpret_cast<cef_window_delegate_t*>(self))
|
||||
->OnWindowChanged(CefViewCToCpp::Wrap(view), added ? true : false);
|
||||
}
|
||||
|
||||
void CEF_CALLBACK window_delegate_on_focus(struct _cef_view_delegate_t* self,
|
||||
cef_view_t* view) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
@ -516,6 +537,7 @@ CefWindowDelegateCppToC::CefWindowDelegateCppToC() {
|
||||
window_delegate_on_parent_view_changed;
|
||||
GetStruct()->base.base.on_child_view_changed =
|
||||
window_delegate_on_child_view_changed;
|
||||
GetStruct()->base.base.on_window_changed = window_delegate_on_window_changed;
|
||||
GetStruct()->base.base.on_focus = window_delegate_on_focus;
|
||||
GetStruct()->base.base.on_blur = window_delegate_on_blur;
|
||||
}
|
||||
|
Reference in New Issue
Block a user