| Index: ui/views/widget/widget.cc
|
| diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
|
| index 14aade85eba307d3e8f52d941e1e2a2d8e153322..6e079b603d896f859768b81c88f96de7185d0d86 100644
|
| --- a/ui/views/widget/widget.cc
|
| +++ b/ui/views/widget/widget.cc
|
| @@ -62,7 +62,7 @@ NativeWidget* CreateNativeWidget(NativeWidget* native_widget,
|
| }
|
| if (!native_widget) {
|
| native_widget =
|
| - internal::NativeWidgetPrivate::CreateNativeWidget(delegate);
|
| + internal::NativeWidgetPrivate::CreateNativeWidget(delegate, parent);
|
| }
|
| }
|
| return native_widget;
|
| @@ -466,7 +466,8 @@ void Widget::CenterWindow(const gfx::Size& size) {
|
|
|
| void Widget::SetBoundsConstrained(const gfx::Rect& bounds) {
|
| gfx::Rect work_area =
|
| - gfx::Screen::GetDisplayNearestPoint(bounds.origin()).work_area();
|
| + gfx::Screen::GetDisplayNearestPoint(
|
| + gfx::Screen::BadTwoWorldsContext(), bounds.origin()).work_area();
|
| if (work_area.IsEmpty()) {
|
| SetBounds(bounds);
|
| } else {
|
|
|