Index: trunk/src/remoting/client/plugin/chromoting_instance.h |
=================================================================== |
--- trunk/src/remoting/client/plugin/chromoting_instance.h (revision 224204) |
+++ trunk/src/remoting/client/plugin/chromoting_instance.h (working copy) |
@@ -33,6 +33,9 @@ |
#include "remoting/protocol/mouse_input_filter.h" |
#include "remoting/protocol/negotiating_client_authenticator.h" |
#include "remoting/protocol/third_party_client_authenticator.h" |
+#include "third_party/skia/include/core/SkPoint.h" |
+#include "third_party/skia/include/core/SkRegion.h" |
+#include "third_party/skia/include/core/SkSize.h" |
namespace base { |
class DictionaryValue; |
@@ -43,12 +46,6 @@ |
class Module; |
} // namespace pp |
-namespace webrtc { |
-class DesktopRegion; |
-class DesktopSize; |
-class DesktopVector; |
-} // namespace webrtc |
- |
namespace remoting { |
class ChromotingClient; |
@@ -135,9 +132,8 @@ |
const protocol::CursorShapeInfo& cursor_shape) OVERRIDE; |
// Called by PepperView. |
- void SetDesktopSize(const webrtc::DesktopSize& size, |
- const webrtc::DesktopVector& dpi); |
- void SetDesktopShape(const webrtc::DesktopRegion& shape); |
+ void SetDesktopSize(const SkISize& size, const SkIPoint& dpi); |
+ void SetDesktopShape(const SkRegion& shape); |
void OnFirstFrameReceived(); |
// Return statistics record by ChromotingClient. |
@@ -243,7 +239,7 @@ |
pp::View plugin_view_; |
// Contains the most-recently-reported desktop shape, if any. |
- scoped_ptr<webrtc::DesktopRegion> desktop_shape_; |
+ scoped_ptr<SkRegion> desktop_shape_; |
scoped_ptr<DelegatingSignalStrategy> signal_strategy_; |