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

ui/views/widget/widget.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/widget/widget.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/events/event.h"
@@ skipping 45 matching lines @@
                                  internal::NativeWidgetDelegate* delegate,
                                  Widget::InitParams::Type type,
                                  gfx::NativeView parent) {
   if (!native_widget) {
     if (ViewsDelegate::views_delegate) {
       native_widget = ViewsDelegate::views_delegate->CreateNativeWidget(
           type, delegate, parent);
     }
     if (!native_widget) {
       native_widget =
-          internal::NativeWidgetPrivate::CreateNativeWidget(delegate);
+          internal::NativeWidgetPrivate::CreateNativeWidget(delegate, parent);
     }
   }
   return native_widget;
 }
 
 }  // namespace
 
 // This class is used to keep track of the event a Widget is processing, and
 // restore any previously active event afterwards.
 class ScopedEvent {
@@ skipping 383 matching lines @@
 void Widget::SetSize(const gfx::Size& size) {
   native_widget_->SetSize(size);
 }
 
 void Widget::CenterWindow(const gfx::Size& size) {
   native_widget_->CenterWindow(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 {
     // Inset the work area slightly.
     work_area.Inset(10, 10, 10, 10);
     SetBounds(work_area.AdjustToFit(bounds));
   }
 }
 
 void Widget::SetVisibilityChangedAnimationsEnabled(bool value) {
@@ skipping 867 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views