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

ui/views/controls/button/custom_button.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 "ui/views/controls/button/custom_button.h"
 
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/events/event.h"
 #include "ui/base/keycodes/keyboard_codes.h"
@@ skipping 56 matching lines @@
 void CustomButton::SetAnimationDuration(int duration) {
   hover_animation_->SetSlideDuration(duration);
 }
 
 bool CustomButton::IsMouseHovered() const {
   // If we haven't yet been placed in an onscreen view hierarchy, we can't be
   // hovered.
   if (!GetWidget())
     return false;
 
-  gfx::Point cursor_pos(gfx::Screen::GetCursorScreenPoint());
+  gfx::Point cursor_pos(gfx::Screen::GetScreenFor(
+      GetWidget()->GetNativeView())->GetCursorScreenPoint());
   ConvertPointToTarget(NULL, this, &cursor_pos);
   return HitTestPoint(cursor_pos);
 }
 
 void CustomButton::SetHotTracked(bool is_hot_tracked) {
   if (state_ != BS_DISABLED)
     SetState(is_hot_tracked ? BS_HOT : BS_NORMAL);
 
   if (is_hot_tracked && GetWidget()) {
     GetWidget()->NotifyAccessibilityEvent(
@@ skipping 234 matching lines @@
   if (!is_add && state_ != BS_DISABLED)
     SetState(BS_NORMAL);
 }
 
 void CustomButton::OnBlur() {
   if (IsHotTracked())
     SetState(BS_NORMAL);
 }
 
 }  // namespace views