Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / remoting / host / win / rdp_client.cc

diff --git a/src/remoting/host/win/rdp_client.cc b/src/remoting/host/win/rdp_client.cc
index 7b3d2c5..80868da 100644 (file)
--- a/src/remoting/host/win/rdp_client.cc
+++ b/src/remoting/host/win/rdp_client.cc
@@ -14,6 +14,7 @@
 #include "net/base/ip_endpoint.h"
 #include "remoting/base/typed_buffer.h"
 #include "remoting/host/win/rdp_client_window.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 
 namespace remoting {
 
@@ -45,7 +46,8 @@ class RdpClient::Core
       RdpClient::EventHandler* event_handler);
 
   // Initiates a loopback RDP connection.
-  void Connect(const SkISize& screen_size, const std::string& terminal_id);
+  void Connect(const webrtc::DesktopSize& screen_size,
+               const std::string& terminal_id);
 
   // Initiates a graceful shutdown of the RDP connection.
   void Disconnect();
@@ -54,8 +56,8 @@ class RdpClient::Core
   void InjectSas();
 
   // RdpClientWindow::EventHandler interface.
-  virtual void OnConnected() OVERRIDE;
-  virtual void OnDisconnected() OVERRIDE;
+  virtual void OnConnected() override;
+  virtual void OnDisconnected() override;
 
  private:
   friend class base::RefCountedThreadSafe<Core>;
@@ -88,7 +90,7 @@ class RdpClient::Core
 RdpClient::RdpClient(
     scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
-    const SkISize& screen_size,
+    const webrtc::DesktopSize& screen_size,
     const std::string& terminal_id,
     EventHandler* event_handler) {
   DCHECK(caller_task_runner->BelongsToCurrentThread());
@@ -118,7 +120,7 @@ RdpClient::Core::Core(
       event_handler_(event_handler) {
 }
 
-void RdpClient::Core::Connect(const SkISize& screen_size,
+void RdpClient::Core::Connect(const webrtc::DesktopSize& screen_size,
                               const std::string& terminal_id) {
   if (!ui_task_runner_->BelongsToCurrentThread()) {
     ui_task_runner_->PostTask(
@@ -126,7 +128,7 @@ void RdpClient::Core::Connect(const SkISize& screen_size,
     return;
   }
 
-  DCHECK_EQ(base::MessageLoop::current()->type(), base::MessageLoop::TYPE_UI);
+  DCHECK(base::MessageLoopForUI::IsCurrent());
   DCHECK(!rdp_client_window_);
   DCHECK(!self_);