| Index: remoting/client/plugin/chromoting_instance.h
|
| diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h
|
| index 25246c1e8742780343789c9f5c7bd09eb9e173d2..f7af0d02277e7012e14853b362b475970c9604e9 100644
|
| --- a/remoting/client/plugin/chromoting_instance.h
|
| +++ b/remoting/client/plugin/chromoting_instance.h
|
| @@ -21,7 +21,6 @@
|
| #include "remoting/client/client_user_interface.h"
|
| #include "remoting/client/key_event_mapper.h"
|
| #include "remoting/client/plugin/empty_cursor_filter.h"
|
| -#include "remoting/client/plugin/media_source_video_renderer.h"
|
| #include "remoting/client/plugin/pepper_cursor_setter.h"
|
| #include "remoting/client/plugin/pepper_input_handler.h"
|
| #include "remoting/client/plugin/pepper_plugin_thread_delegate.h"
|
| @@ -75,7 +74,6 @@ struct ClientConfig;
|
|
|
| class ChromotingInstance :
|
| public ClientUserInterface,
|
| - public MediaSourceVideoRenderer::Delegate,
|
| public protocol::ClipboardStub,
|
| public protocol::CursorShapeStub,
|
| public pp::Instance {
|
| @@ -203,7 +201,6 @@ class ChromotingInstance :
|
| void HandleRequestPairing(const base::DictionaryValue& data);
|
| void HandleExtensionMessage(const base::DictionaryValue& data);
|
| void HandleAllowMouseLockMessage();
|
| - void HandleEnableMediaSourceRendering();
|
| void HandleSendMouseInputWhenUnfocused();
|
| void HandleDelegateLargeCursors();
|
|
|
| @@ -242,15 +239,6 @@ class ChromotingInstance :
|
| bool pairing_supported,
|
| const protocol::SecretFetchedCallback& secret_fetched_callback);
|
|
|
| - // MediaSourceVideoRenderer::Delegate implementation.
|
| - void OnMediaSourceSize(const webrtc::DesktopSize& size,
|
| - const webrtc::DesktopVector& dpi) override;
|
| - void OnMediaSourceShape(const webrtc::DesktopRegion& shape) override;
|
| - void OnMediaSourceReset(const std::string& format) override;
|
| - void OnMediaSourceData(uint8_t* buffer,
|
| - size_t buffer_size,
|
| - bool keyframe) override;
|
| -
|
| bool initialized_;
|
|
|
| PepperPluginThreadDelegate plugin_thread_delegate_;
|
| @@ -291,11 +279,6 @@ class ChromotingInstance :
|
| bool use_async_pin_dialog_;
|
| protocol::SecretFetchedCallback secret_fetched_callback_;
|
|
|
| - // Set to true if the webapp has requested to use MediaSource API for
|
| - // rendering. In that case all the encoded video will be passed to the
|
| - // webapp for decoding.
|
| - bool use_media_source_rendering_;
|
| -
|
| base::WeakPtr<TokenFetcherProxy> token_fetcher_proxy_;
|
|
|
| // Weak reference to this instance, used for global logging and task posting.
|
|
|