mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-11 09:08:06 +01:00
3000bc8748
This change adds Chrome runtime support on Windows and Linux for creating a browser parented to a native window supplied by the client application. Expected API usage and window behavior is similar to what already exists with the Alloy runtime. The parent window handle should be specified by using CefWindowInfo::SetAsChild in combination with the CefBrowserHost::CreateBrowser and CefLifeSpanHandler::OnBeforePopup callbacks. The previously existing behavior of creating a fully-featured Chrome browser window when empty CefWindowInfo is used with CreateBrowser remains unchanged and Views is still the preferred API for creating top-level Chrome windows with custom styling (e.g. title bar only, frameless, etc). The cefclient Popup Window test with a native parent window continues to crash on Linux with both the Alloy and Chrome runtimes (see issue #3165). Also adds Chrome runtime support for CefDisplayHandler::OnCursorChange. To test: - Run `cefclient --enable-chrome-runtime [--use-views]` for the default (and previously existing) Views-based behavior. - Run `cefclient --enable-chrome-runtime --use-native` for the new native parent window behavior. - Run `cefclient --enable-chrome-runtime --use-native --no-activate` and the window will not be activated (take input focus) on launch (Windows only). - Run `cefclient --enable-chrome-runtime [--use-views|--use-native] --mouse-cursor-change-disabled` and the mouse cursor will not change on mouseover of DOM elements.
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
diff --git ui/shell_dialogs/base_shell_dialog_win.cc ui/shell_dialogs/base_shell_dialog_win.cc
|
|
index 46fd116c02dad..499bf49cff882 100644
|
|
--- ui/shell_dialogs/base_shell_dialog_win.cc
|
|
+++ ui/shell_dialogs/base_shell_dialog_win.cc
|
|
@@ -59,11 +59,15 @@ BaseShellDialogImpl::Owners& BaseShellDialogImpl::GetOwners() {
|
|
|
|
// static
|
|
void BaseShellDialogImpl::DisableOwner(HWND owner) {
|
|
+ if (owner)
|
|
+ owner = GetAncestor(owner, GA_ROOT);
|
|
SetOwnerEnabled(owner, false);
|
|
}
|
|
|
|
std::unique_ptr<BaseShellDialogImpl::RunState> BaseShellDialogImpl::BeginRun(
|
|
HWND owner) {
|
|
+ if (owner)
|
|
+ owner = GetAncestor(owner, GA_ROOT);
|
|
// Cannot run a modal shell dialog if one is already running for this owner.
|
|
DCHECK(!IsRunningDialogForOwner(owner));
|
|
// The owner must be a top level window, otherwise we could end up with two
|
|
@@ -89,6 +93,8 @@ void BaseShellDialogImpl::EndRun(std::unique_ptr<RunState> run_state) {
|
|
}
|
|
|
|
bool BaseShellDialogImpl::IsRunningDialogForOwner(HWND owner) const {
|
|
+ if (owner)
|
|
+ owner = GetAncestor(owner, GA_ROOT);
|
|
return (owner && GetOwners().find(owner) != GetOwners().end());
|
|
}
|
|
|