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

chrome/browser/ui/views/panels/panel_view.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/panels/panel_view.h"
 
 #include <map>
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 638 matching lines @@
 
   // Expand the panel if the minimized panel is activated by means other than
   // clicking on its titlebar. This is the workaround to support restoring the
   // minimized panel by other means, like alt-tabbing, win-tabbing, or clicking
   // the taskbar icon. Note that this workaround does not work for one edge
   // case: the mouse happens to be at the minimized panel when the user tries to
   // bring up the panel with the above alternatives.
   // When the user clicks on the minimized panel, the panel expansion will be
   // done when we process the mouse button pressed message.
   if (focused_ && panel_->IsMinimized() &&
-      gfx::Screen::GetWindowAtCursorScreenPoint() !=
-          widget->GetNativeWindow()) {
+      gfx::Screen::GetScreenFor(widget->GetNativeWindow())->
+          GetWindowAtCursorScreenPoint() != widget->GetNativeWindow()) {
     panel_->Restore();
   }
 
   panel()->OnActiveStateChanged(focused);
 }
 
 bool PanelView::OnTitlebarMousePressed(const gfx::Point& mouse_location) {
   mouse_pressed_ = true;
   mouse_dragging_state_ = NO_DRAGGING;
   last_mouse_location_ = mouse_location;
@@ skipping 117 matching lines @@
   int height = web_view_->size().height();
   SkRegion* region = new SkRegion;
   region->op(0, 0, kResizeInsideBoundsSize, height, SkRegion::kUnion_Op);
   region->op(width - kResizeInsideBoundsSize, 0, width, height,
       SkRegion::kUnion_Op);
   region->op(0, height - kResizeInsideBoundsSize, width, height,
       SkRegion::kUnion_Op);
   web_contents->GetRenderViewHost()->GetView()->SetClickthroughRegion(region);
 #endif
 }