aura: Remove WindowTreeHost::QueryMouseLocation().

ui/aura/window_tree_host.h

 // 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.
 
 #ifndef UI_AURA_WINDOW_TREE_HOST_H_
 #define UI_AURA_WINDOW_TREE_HOST_H_
 
 #include <vector>
 
 #include "base/event_types.h"
@@ skipping 11 matching lines @@
 class Transform;
 }
 
 namespace ui {
 class Compositor;
 class EventProcessor;
 class ViewProp;
 }
 
 namespace aura {
+namespace test {
+class WindowTreeHostTestApi;
+}
+
 class WindowEventDispatcher;
 class WindowTreeHostObserver;
 
 // WindowTreeHost bridges between a native window and the embedded RootWindow.
 // It provides the accelerated widget and maps events from the native os to
 // aura.
 class AURA_EXPORT WindowTreeHost {
  public:
   virtual ~WindowTreeHost();
 
@@ skipping 86 matching lines @@
   // Gets/Sets the size of the WindowTreeHost.
   virtual gfx::Rect GetBounds() const = 0;
   virtual void SetBounds(const gfx::Rect& bounds) = 0;
 
   // Sets the OS capture to the root window.
   virtual void SetCapture() = 0;
 
   // Releases OS capture of the root window.
   virtual void ReleaseCapture() = 0;
 
-  // Queries the mouse's current position relative to the host window and sets
-  // it in |location_return|. Returns true if the cursor is within the host
-  // window. The position set to |location_return| is constrained within the
-  // host window. If the cursor is disabled, returns false and (0, 0) is set to
-  // |location_return|.
-  // This method is expensive, instead use gfx::Screen::GetCursorScreenPoint().
-  virtual bool QueryMouseLocation(gfx::Point* location_return) = 0;
-
   // Posts |native_event| to the platform's event queue.
   virtual void PostNativeEvent(const base::NativeEvent& native_event) = 0;
 
   // Called when the device scale factor of the root window has chagned.
   virtual void OnDeviceScaleFactorChanged(float device_scale_factor) = 0;
 
  protected:
   friend class TestScreen;  // TODO(beng): see if we can remove/consolidate.
 
   WindowTreeHost();
@@ skipping 14 matching lines @@
   // Sets the currently displayed cursor.
   virtual void SetCursorNative(gfx::NativeCursor cursor) = 0;
 
   // Moves the cursor to the specified location relative to the root window.
   virtual void MoveCursorToNative(const gfx::Point& location) = 0;
 
   // kCalled when the cursor visibility has changed.
   virtual void OnCursorVisibilityChangedNative(bool show) = 0;
 
  private:
+  friend class test::WindowTreeHostTestApi;
+
   // Moves the cursor to the specified location. This method is internally used
   // by MoveCursorTo() and MoveCursorToHostLocation().
   void MoveCursorToInternal(const gfx::Point& root_location,
                             const gfx::Point& host_location);
 
   // We don't use a scoped_ptr for |window_| since we need this ptr to be valid
   // during its deletion. (Window's dtor notifies observers that may attempt to
   // reach back up to access this object which will be valid until the end of
   // the dtor).
   Window* window_;  // Owning.
 
   ObserverList<WindowTreeHostObserver> observers_;
 
   scoped_ptr<WindowEventDispatcher> dispatcher_;
 
   scoped_ptr<ui::Compositor> compositor_;
 
   // Last cursor set.  Used for testing.
   gfx::NativeCursor last_cursor_;
+  gfx::Point last_cursor_request_position_in_host_;
 
   scoped_ptr<ui::ViewProp> prop_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHost);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_TREE_HOST_H_