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

ui/views/mouse_watcher.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/mouse_watcher.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/event_types.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 68 matching lines @@
     }
   }
 #endif
 
  private:
   MouseWatcherHost* host() const { return mouse_watcher_->host_.get(); }
 
   // Called from the message loop observer when a mouse movement has occurred.
   void HandleGlobalMouseMoveEvent(MouseWatcherHost::MouseEventType event_type) {
     bool contained = host()->Contains(
-        gfx::Screen::GetCursorScreenPoint(), event_type);
+        // TODO(scottmg): Native is wrong http://crbug.com/133312
+        gfx::Screen::GetNativeScreen()->GetCursorScreenPoint(),
+        event_type);
     if (!contained) {
       // Mouse moved outside the host's zone, start a timer to notify the
       // listener.
       if (!notify_listener_factory_.HasWeakPtrs()) {
         MessageLoop::current()->PostDelayedTask(
             FROM_HERE,
             base::Bind(&Observer::NotifyListener,
                        notify_listener_factory_.GetWeakPtr()),
             event_type == MouseWatcherHost::MOUSE_MOVE ?
                 base::TimeDelta::FromMilliseconds(kNotifyListenerTimeMs) :
@@ skipping 45 matching lines @@
 void MouseWatcher::Stop() {
   observer_.reset(NULL);
 }
 
 void MouseWatcher::NotifyListener() {
   observer_.reset(NULL);
   listener_->MouseMovedOutOfHost();
 }
 
 }  // namespace views