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

content/browser/renderer_host/render_widget_host_view_base.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 "content/browser/renderer_host/render_widget_host_view_base.h"
 
 #include "base/logging.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/port/browser/smooth_scroll_gesture.h"
@@ skipping 381 matching lines @@
 BrowserAccessibilityManager*
     RenderWidgetHostViewBase::GetBrowserAccessibilityManager() const {
   return browser_accessibility_manager_.get();
 }
 
 void RenderWidgetHostViewBase::SetBrowserAccessibilityManager(
     BrowserAccessibilityManager* manager) {
   browser_accessibility_manager_.reset(manager);
 }
 
-void RenderWidgetHostViewBase::UpdateScreenInfo() {
-  gfx::Display display = gfx::Screen::GetDisplayNearestPoint(
-      GetViewBounds().origin());
+void RenderWidgetHostViewBase::UpdateScreenInfo(gfx::NativeView view) {
+  gfx::Display display =
+      gfx::Screen::GetScreenFor(view)->GetDisplayNearestPoint(
+          GetViewBounds().origin());
   if (current_display_area_ == display.bounds() &&
       current_device_scale_factor_ == display.device_scale_factor())
     return;
   current_display_area_ = display.bounds();
   current_device_scale_factor_ = display.device_scale_factor();
   if (GetRenderWidgetHost()) {
     RenderWidgetHostImpl* impl =
         RenderWidgetHostImpl::From(GetRenderWidgetHost());
     impl->NotifyScreenInfoChanged();
   }
@@ skipping 62 matching lines @@
   int mouse_event_y_;
 };
 
 SmoothScrollGesture* RenderWidgetHostViewBase::CreateSmoothScrollGesture(
     bool scroll_down, bool scroll_far, int mouse_event_x, int mouse_event_y) {
   return new BasicMouseWheelSmoothScrollGesture(scroll_down, scroll_far,
                                                 mouse_event_x, mouse_event_y);
 }
 
 }  // namespace content