Add context to gfx::Screen calls in support of simultaneous desktop+ash

ui/views/widget/widget.cc

Index: ui/views/widget/widget.cc
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index 361a39904a2b58b9cc1862fe805fc7e5802ccd1c..c4461cc41ecb69a092bcb061c5ce5511f9fb2805 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -63,7 +63,7 @@ NativeWidget* CreateNativeWidget(NativeWidget* native_widget,
     }
     if (!native_widget) {
       native_widget =
-          internal::NativeWidgetPrivate::CreateNativeWidget(delegate);
+          internal::NativeWidgetPrivate::CreateNativeWidget(delegate, parent);
     }
   }
   return native_widget;
@@ -467,7 +467,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::GetScreenFor(GetNativeView())->GetDisplayNearestPoint(
+          bounds.origin()).work_area();
   if (work_area.IsEmpty()) {
     SetBounds(bounds);
   } else {