| Index: remoting/client/plugin/chromoting_instance.h
|
| diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h
|
| index bd4e7c41cc69a4493351a9bf8a2d15b5fa7f269d..d630bf9f0c53c01e3f909f7841277351fb8fc416 100644
|
| --- a/remoting/client/plugin/chromoting_instance.h
|
| +++ b/remoting/client/plugin/chromoting_instance.h
|
| @@ -104,37 +104,33 @@ class ChromotingInstance :
|
| static const int kApiMinScriptableVersion = 5;
|
|
|
| explicit ChromotingInstance(PP_Instance instance);
|
| - virtual ~ChromotingInstance();
|
| + ~ChromotingInstance() override;
|
|
|
| // pp::Instance interface.
|
| - virtual void DidChangeFocus(bool has_focus) override;
|
| - virtual void DidChangeView(const pp::View& view) override;
|
| - virtual bool Init(uint32_t argc, const char* argn[],
|
| - const char* argv[]) override;
|
| - virtual void HandleMessage(const pp::Var& message) override;
|
| - virtual bool HandleInputEvent(const pp::InputEvent& event) override;
|
| + void DidChangeFocus(bool has_focus) override;
|
| + void DidChangeView(const pp::View& view) override;
|
| + bool Init(uint32_t argc, const char* argn[], const char* argv[]) override;
|
| + void HandleMessage(const pp::Var& message) override;
|
| + bool HandleInputEvent(const pp::InputEvent& event) override;
|
|
|
| // ClientUserInterface interface.
|
| - 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(
|
| + 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& pairing_response) override;
|
| - virtual void DeliverHostMessage(
|
| - const protocol::ExtensionMessage& message) override;
|
| - virtual protocol::ClipboardStub* GetClipboardStub() override;
|
| - virtual protocol::CursorShapeStub* GetCursorShapeStub() override;
|
| + void DeliverHostMessage(const protocol::ExtensionMessage& message) override;
|
| + protocol::ClipboardStub* GetClipboardStub() override;
|
| + protocol::CursorShapeStub* GetCursorShapeStub() override;
|
|
|
| // protocol::ClipboardStub interface.
|
| - virtual void InjectClipboardEvent(
|
| - const protocol::ClipboardEvent& event) override;
|
| + void InjectClipboardEvent(const protocol::ClipboardEvent& event) override;
|
|
|
| // protocol::CursorShapeStub interface.
|
| - virtual void SetCursorShape(
|
| - const protocol::CursorShapeInfo& cursor_shape) override;
|
| + void SetCursorShape(const protocol::CursorShapeInfo& cursor_shape) override;
|
|
|
| // Called by PepperView.
|
| void SetDesktopSize(const webrtc::DesktopSize& size,
|
| @@ -244,12 +240,13 @@ class ChromotingInstance :
|
| const protocol::SecretFetchedCallback& secret_fetched_callback);
|
|
|
| // MediaSourceVideoRenderer::Delegate implementation.
|
| - virtual void OnMediaSourceSize(const webrtc::DesktopSize& size,
|
| - const webrtc::DesktopVector& dpi) override;
|
| - virtual void OnMediaSourceShape(const webrtc::DesktopRegion& shape) override;
|
| - virtual void OnMediaSourceReset(const std::string& format) override;
|
| - virtual void OnMediaSourceData(uint8_t* buffer, size_t buffer_size,
|
| - bool keyframe) override;
|
| + 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_;
|
|
|
|
|