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

content/browser/web_contents/web_contents_view_win.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/web_contents/web_contents_view_win.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
@@ skipping 41 matching lines @@
 }
 
 BOOL CALLBACK EnumChildProc(HWND hwnd, LPARAM lParam) {
   HwndToWcvMap::iterator it = hwnd_to_wcv_map.find(hwnd);
   if (it == hwnd_to_wcv_map.end())
     return TRUE;  // must return TRUE to continue enumeration.
   WebContentsViewWin* wcv = it->second;
   RenderWidgetHostViewWin* rwhv = static_cast<RenderWidgetHostViewWin*>(
       wcv->web_contents()->GetRenderWidgetHostView());
   if (rwhv)
-    rwhv->UpdateScreenInfo();
+    rwhv->UpdateScreenInfo(rwhv->GetNativeView());
 
   return TRUE;  // must return TRUE to continue enumeration.
 }
 
 class PositionChangedMessageFilter : public ui::HWNDMessageFilter {
  public:
   PositionChangedMessageFilter() {}
 
  private:
   // Overridden from ui::HWNDMessageFilter:
@@ skipping 266 matching lines @@
   }
 
   // The WebContents was shown by a means other than the user selecting a
   // Tab, e.g. the window was minimized then restored.
   if (window_pos->flags & SWP_SHOWWINDOW)
     web_contents_->WasShown();
 
   RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView();
   if (rwhv) {
     RenderWidgetHostViewWin* view = static_cast<RenderWidgetHostViewWin*>(rwhv);
-    view->UpdateScreenInfo();
+    view->UpdateScreenInfo(view->GetNativeView());
   }
 
   // Unless we were specifically told not to size, cause the renderer to be
   // sized to the new bounds, which forces a repaint. Not required for the
   // simple minimize-restore case described above, for example, since the
   // size hasn't changed.
   if (window_pos->flags & SWP_NOSIZE)
     return 0;
 
   gfx::Size size(window_pos->cx, window_pos->cy);
@@ skipping 15 matching lines @@
     web_contents_->GetDelegate()->ActivateContents(web_contents_);
   return 0;
 }
 
 LRESULT WebContentsViewWin::OnMouseMove(
     UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled) {
   // Let our delegate know that the mouse moved (useful for resetting status
   // bubble state).
   if (web_contents_->GetDelegate()) {
     web_contents_->GetDelegate()->ContentsMouseEvent(
-        web_contents_, gfx::Screen::GetCursorScreenPoint(), true);
+        web_contents_,
+        gfx::Screen::GetNativeScreen()->GetCursorScreenPoint(),
+        true);
   }
   return 0;
 }
 
 LRESULT WebContentsViewWin::OnReflectedMessage(
     UINT msg, WPARAM wparam, LPARAM lparam, BOOL& handled) {
   MSG* message = reinterpret_cast<MSG*>(lparam);
   switch (message->message) {
     case WM_MOUSEWHEEL:
       // This message is reflected from the view() to this window.
@@ skipping 78 matching lines @@
   si.nMin = 1;
   si.nMax = 100;
   si.nPage = 10;
   si.nPos = 50;
 
   ::SetScrollInfo(hwnd(), SB_HORZ, &si, FALSE);
   ::SetScrollInfo(hwnd(), SB_VERT, &si, FALSE);
 
   return 1;
 }