Move us fully from gfx:: over to skia types for consistency.

remoting/host/client_session.h

 // Copyright (c) 2011 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 REMOTING_HOST_CLIENT_SESSION_H_
 #define REMOTING_HOST_CLIENT_SESSION_H_
 
 #include <list>
 #include <set>
 
 #include "base/time.h"
 #include "remoting/protocol/connection_to_client.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/input_stub.h"
-#include "ui/gfx/point.h"
+#include "third_party/skia/include/core/SkPoint.h"
 
 namespace remoting {
 
 class Capturer;
 class UserAuthenticator;
 
 // A ClientSession keeps a reference to a connection to a client, and maintains
 // per-client state.
 class ClientSession : public protocol::HostStub,
                       public protocol::InputStub,
@@ skipping 47 matching lines @@
 
   void set_awaiting_continue_approval(bool awaiting) {
     awaiting_continue_approval_ = awaiting;
   }
 
   const std::string& client_jid() { return client_jid_; }
 
   // Indicate that local mouse activity has been detected. This causes remote
   // inputs to be ignored for a short time so that the local user will always
   // have the upper hand in 'pointer wars'.
-  void LocalMouseMoved(const gfx::Point& new_pos);
+  void LocalMouseMoved(const SkIPoint& new_pos);
 
   bool ShouldIgnoreRemoteMouseInput(const protocol::MouseEvent& event) const;
   bool ShouldIgnoreRemoteKeyboardInput(const protocol::KeyEvent& event) const;
 
  private:
   friend class base::RefCountedThreadSafe<ClientSession>;
   friend class ClientSessionTest_RestoreEventState_Test;
   virtual ~ClientSession();
 
   // Keep track of input state so that we can clean up the event queue when
@@ skipping 29 matching lines @@
 
   // Whether or not inputs from this client are blocked pending approval from
   // the host user to continue the connection.
   bool awaiting_continue_approval_;
 
   // State to control remote input blocking while the local pointer is in use.
   uint32 remote_mouse_button_state_;
 
   // Current location of the mouse pointer. This is used to provide appropriate
   // coordinates when we release the mouse buttons after a user disconnects.
-  gfx::Point remote_mouse_pos_;
+  SkIPoint remote_mouse_pos_;
 
   // Queue of recently-injected mouse positions.  This is used to detect whether
   // mouse events from the local input monitor are echoes of injected positions,
   // or genuine mouse movements of a local input device.
-  std::list<gfx::Point> injected_mouse_positions_;
+  std::list<SkIPoint> injected_mouse_positions_;
 
   base::Time latest_local_input_time_;
 
   // Set of keys that are currently pressed down by the user. This is used so
   // we can release them if the user disconnects.
   std::set<int> pressed_keys_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientSession);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CLIENT_SESSION_H_