| Index: ui/views/cocoa/bridged_native_widget.mm
|
| diff --git a/ui/views/cocoa/bridged_native_widget.mm b/ui/views/cocoa/bridged_native_widget.mm
|
| index 2432960be0754f1890f7bcb7002f2ee249b2b741..9907347c10abe27ff54d04e41ec00f428e41d92a 100644
|
| --- a/ui/views/cocoa/bridged_native_widget.mm
|
| +++ b/ui/views/cocoa/bridged_native_widget.mm
|
| @@ -428,6 +428,11 @@ void BridgedNativeWidget::Init(base::scoped_nsobject<NSWindow> window,
|
| } else {
|
| parent_ = new WidgetOwnerNSWindowAdapter(this, params.parent);
|
| }
|
| + // crbug.com/697829: Widget::ShowInactive() could result in a Space switch
|
| + // when the widget has a parent, and we're calling -orderWindow:relativeTo:.
|
| + // Use Transient collection behaviour to prevent that.
|
| + [window_ setCollectionBehavior:[window_ collectionBehavior] |
|
| + NSWindowCollectionBehaviorTransient];
|
| }
|
|
|
| // OSX likes to put shadows on most things. However, frameless windows (with
|
|
|