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

chrome/browser/ui/views/tabs/tab_drag_controller.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_drag_controller.h"
 
 #include <math.h>
 #include <set>
 
 #include "base/callback.h"
@@ skipping 653 matching lines @@
 gfx::Point TabDragController::GetWindowCreatePoint(
     const gfx::Point& origin) const {
   if (dock_info_.type() != DockInfo::NONE && dock_info_.in_enable_area()) {
     // If we're going to dock, we need to return the exact coordinate,
     // otherwise we may attempt to maximize on the wrong monitor.
     return origin;
   }
 
   // If the cursor is outside the monitor area, move it inside. For example,
   // dropping a tab onto the task bar on Windows produces this situation.
-  gfx::Rect work_area = gfx::Screen::GetDisplayNearestPoint(origin).work_area();
+  gfx::Rect work_area = gfx::Screen::GetScreenFor(
+      source_tabstrip_->GetWidget()->GetNativeView())->
+          GetDisplayNearestPoint(origin).work_area();

[oshima, 2012/10/10 17:58:23]

Any reason this and next change are using different widgets?

[scottmg, 2012/10/10 19:04:47]

No, I'm just not familiar with code, so I wasn't clear on when particular
members are valid.

Looking at where GetWindowCreatePoint is called from pointed to source_tabstrip_
being valid at this point, whereas below,
GetAttachedBrowserWidget()/attached_tabstrip_ look to be valid. So, using a
different one in both places seemed the safest change.

   gfx::Point create_point(origin);
   if (!work_area.IsEmpty()) {
     if (create_point.x() < work_area.x())
       create_point.set_x(work_area.x());
     else if (create_point.x() > work_area.right())
       create_point.set_x(work_area.right());
     if (create_point.y() < work_area.y())
       create_point.set_y(work_area.y());
     else if (create_point.y() > work_area.bottom())
       create_point.set_y(work_area.bottom());
@@ skipping 1291 matching lines @@
     aura::Window* widget_window = widget->GetNativeWindow();
     DCHECK(widget_window->GetRootWindow());
     gfx::Point touch_point;
     bool got_touch_point = widget_window->GetRootWindow()->
         gesture_recognizer()->GetLastTouchPointForTarget(widget_window,
                                                          &touch_point);
     DCHECK(got_touch_point);
     return touch_point;
   }
 #endif
-  return gfx::Screen::GetCursorScreenPoint();
+  return gfx::Screen::GetScreenFor(
+      GetAttachedBrowserWidget()->GetNativeView())->GetCursorScreenPoint();
 }
 
 gfx::Point TabDragController::GetWindowOffset(
     const gfx::Point& point_in_screen) {
   TabStrip* owning_tabstrip = (attached_tabstrip_ && detach_into_browser_) ?
       attached_tabstrip_ : source_tabstrip_;
   views::View* toplevel_view = owning_tabstrip->GetWidget()->GetContentsView();
 
   gfx::Point offset = point_in_screen;
   views::View::ConvertPointFromScreen(toplevel_view, &offset);
   return offset;
 }