Remove dependency on skia from remoting

remoting/host/win/rdp_client_window.h

 // Copyright (c) 2013 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_WIN_RDP_HOST_WINDOW_H_
 #define REMOTING_HOST_WIN_RDP_HOST_WINDOW_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <atlcrack.h>
 #include <atlctl.h>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/win/scoped_comptr.h"
 #include "net/base/ip_endpoint.h"
-#include "third_party/skia/include/core/SkSize.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 
 #import "PROGID:MsTscAx.MsTscAx" \
     exclude("wireHWND", "_RemotableHandle", "__MIDL_IWinTypes_0009"), \
     rename_namespace("mstsc") raw_interfaces_only no_implementation
 
 namespace remoting {
 
 // RdpClientWindow is used to establish a connection to the given RDP endpoint.
 // It is a GUI window class that hosts Microsoft RDP ActiveX control, which
 // takes care of handling RDP properly. RdpClientWindow must be used only on
@@ skipping 36 matching lines @@
   // Specifies the endpoint to connect to and passes the event handler pointer
   // to be notified about connection events.
   RdpClientWindow(const net::IPEndPoint& server_endpoint,
                   const std::string& terminal_id,
                   EventHandler* event_handler);
   ~RdpClientWindow();
 
   // Creates the window along with the ActiveX control and initiates the
   // connection. |screen_size| specifies resolution of the screen. Returns false
   // if an error occurs.
-  bool Connect(const SkISize& screen_size);
+  bool Connect(const webrtc::DesktopSize& screen_size);
 
   // Initiates shutdown of the connection. The caller must not delete |this|
   // until it receives OnDisconnected() notification.
   void Disconnect();
 
   // Emulates pressing Ctrl+Alt+End combination that is translated to Secure
   // Attention Sequence by the ActiveX control.
   void InjectSas();
 
  private:
@@ skipping 40 matching lines @@
   // Wrappers for the event handler's methods that make sure that
   // OnDisconnected() is the last notification delivered and is delevered
   // only once.
   void NotifyConnected();
   void NotifyDisconnected();
 
   // Invoked to report connect/disconnect events.
   EventHandler* event_handler_;
 
   // Contains the requested dimensions of the screen.
-  SkISize screen_size_;
+  webrtc::DesktopSize screen_size_;
 
   // The endpoint to connect to.
   net::IPEndPoint server_endpoint_;
 
   // The terminal ID assigned to this connection.
   std::string terminal_id_;
 
   // Interfaces exposed by the RDP ActiveX control.
   base::win::ScopedComPtr<mstsc::IMsRdpClient> client_;
   base::win::ScopedComPtr<mstsc::IMsRdpClientAdvancedSettings> client_settings_;
 
   // Used to cancel modal dialog boxes shown by the RDP control.
   class WindowHook;
   scoped_refptr<WindowHook> window_activate_hook_;
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_WIN_RDP_HOST_WINDOW_H_