| Index: remoting/client/jni/chromoting_jni_instance.h
|
| diff --git a/remoting/client/jni/chromoting_jni_instance.h b/remoting/client/jni/chromoting_jni_instance.h
|
| index 204525fa2a267dc31f1260856c0b4b1935d51ae5..75cbb91bc0f1a32d29d727dda55b8478f139edb9 100644
|
| --- a/remoting/client/jni/chromoting_jni_instance.h
|
| +++ b/remoting/client/jni/chromoting_jni_instance.h
|
| @@ -94,30 +94,26 @@ class ChromotingJniInstance
|
| void RecordPaintTime(int64 paint_time_ms);
|
|
|
| // ClientUserInterface implementation.
|
| - virtual void OnConnectionState(
|
| - protocol::ConnectionToHost::State state,
|
| - protocol::ErrorCode error) override;
|
| - virtual void OnConnectionReady(bool ready) override;
|
| - virtual void OnRouteChanged(const std::string& channel_name,
|
| - const protocol::TransportRoute& route) override;
|
| - virtual void SetCapabilities(const std::string& capabilities) override;
|
| - virtual void SetPairingResponse(
|
| - const protocol::PairingResponse& response) override;
|
| - virtual void DeliverHostMessage(
|
| - const protocol::ExtensionMessage& message) override;
|
| - virtual protocol::ClipboardStub* GetClipboardStub() override;
|
| - virtual protocol::CursorShapeStub* GetCursorShapeStub() override;
|
| + void OnConnectionState(protocol::ConnectionToHost::State state,
|
| + protocol::ErrorCode error) override;
|
| + void OnConnectionReady(bool ready) override;
|
| + void OnRouteChanged(const std::string& channel_name,
|
| + const protocol::TransportRoute& route) override;
|
| + void SetCapabilities(const std::string& capabilities) override;
|
| + void SetPairingResponse(const protocol::PairingResponse& response) override;
|
| + void DeliverHostMessage(const protocol::ExtensionMessage& message) override;
|
| + protocol::ClipboardStub* GetClipboardStub() override;
|
| + protocol::CursorShapeStub* GetCursorShapeStub() override;
|
|
|
| // CursorShapeStub implementation.
|
| - virtual void InjectClipboardEvent(
|
| - const protocol::ClipboardEvent& event) override;
|
| + void InjectClipboardEvent(const protocol::ClipboardEvent& event) override;
|
|
|
| // ClipboardStub implementation.
|
| - virtual void SetCursorShape(const protocol::CursorShapeInfo& shape) override;
|
| + void SetCursorShape(const protocol::CursorShapeInfo& shape) override;
|
|
|
| private:
|
| // This object is ref-counted, so it cleans itself up.
|
| - virtual ~ChromotingJniInstance();
|
| + ~ChromotingJniInstance() override;
|
|
|
| void ConnectToHostOnDisplayThread();
|
| void ConnectToHostOnNetworkThread();
|
|
|