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

chrome/browser/ui/views/tabs/tab_strip.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 "chrome/browser/ui/views/tabs/tab_strip.h"
 
 #if defined(OS_WIN)
 #include <windowsx.h>
 #endif
 
@@ skipping 548 matching lines @@
     // spawned by non-mouse closes and drag-detaches.
     return;
   }
 
   views::Widget* widget = tabstrip_->GetWidget();
   // This can be null during shutdown. See http://crbug.com/42737.
   if (!widget)
     return;
 
   widget->ResetLastMouseMoveFlag();
-  gfx::Point position = gfx::Screen::GetCursorScreenPoint();
+  gfx::Point position = gfx::Screen::GetScreenFor(
+      widget->GetNativeView())->GetCursorScreenPoint();
   views::View* root_view = widget->GetRootView();
   views::View::ConvertPointFromScreen(root_view, &position);
   ui::MouseEvent mouse_event(ui::ET_MOUSE_MOVED,
                              position, position,
                              ui::EF_IS_SYNTHESIZED);
   root_view->OnMouseMoved(mouse_event);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabStrip, public:
@@ skipping 1990 matching lines @@
   if (!adjust_layout_)
     return false;
 
 #if !defined(OS_CHROMEOS)
   if (ui::GetDisplayLayout() != ui::LAYOUT_TOUCH)
     return false;
 #endif
 
   return true;
 }