Index: remoting/host/ipc_desktop_environment.h |
diff --git a/remoting/host/ipc_desktop_environment.h b/remoting/host/ipc_desktop_environment.h |
index 8490780ebb903865c581cea69262f3ee155d6e72..bc829eee78268f62371bdd135f6ad2371e80369a 100644 |
--- a/remoting/host/ipc_desktop_environment.h |
+++ b/remoting/host/ipc_desktop_environment.h |
@@ -46,18 +46,17 @@ class IpcDesktopEnvironment : public DesktopEnvironment { |
base::WeakPtr<ClientSessionControl> client_session_control, |
base::WeakPtr<DesktopSessionConnector> desktop_session_connector, |
bool virtual_terminal); |
- virtual ~IpcDesktopEnvironment(); |
+ ~IpcDesktopEnvironment() override; |
// DesktopEnvironment implementation. |
- virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() override; |
- virtual scoped_ptr<InputInjector> CreateInputInjector() override; |
- virtual scoped_ptr<ScreenControls> CreateScreenControls() override; |
- virtual scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override; |
- virtual scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor() |
- override; |
- virtual std::string GetCapabilities() const override; |
- virtual void SetCapabilities(const std::string& capabilities) override; |
- virtual scoped_ptr<GnubbyAuthHandler> CreateGnubbyAuthHandler( |
+ scoped_ptr<AudioCapturer> CreateAudioCapturer() override; |
+ scoped_ptr<InputInjector> CreateInputInjector() override; |
+ scoped_ptr<ScreenControls> CreateScreenControls() override; |
+ scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override; |
+ scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor() override; |
+ std::string GetCapabilities() const override; |
+ void SetCapabilities(const std::string& capabilities) override; |
+ scoped_ptr<GnubbyAuthHandler> CreateGnubbyAuthHandler( |
protocol::ClientStub* client_stub) override; |
private: |
@@ -80,29 +79,26 @@ class IpcDesktopEnvironmentFactory |
scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, |
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, |
IPC::Sender* daemon_channel); |
- virtual ~IpcDesktopEnvironmentFactory(); |
+ ~IpcDesktopEnvironmentFactory() override; |
// DesktopEnvironmentFactory implementation. |
- virtual scoped_ptr<DesktopEnvironment> Create( |
+ scoped_ptr<DesktopEnvironment> Create( |
base::WeakPtr<ClientSessionControl> client_session_control) override; |
- virtual void SetEnableCurtaining(bool enable) override; |
- virtual bool SupportsAudioCapture() const override; |
+ void SetEnableCurtaining(bool enable) override; |
+ bool SupportsAudioCapture() const override; |
// DesktopSessionConnector implementation. |
- virtual void ConnectTerminal( |
- DesktopSessionProxy* desktop_session_proxy, |
- const ScreenResolution& resolution, |
- bool virtual_terminal) override; |
- virtual void DisconnectTerminal( |
- DesktopSessionProxy* desktop_session_proxy) override; |
- virtual void SetScreenResolution( |
- DesktopSessionProxy* desktop_session_proxy, |
- const ScreenResolution& resolution) override; |
- virtual void OnDesktopSessionAgentAttached( |
+ void ConnectTerminal(DesktopSessionProxy* desktop_session_proxy, |
+ const ScreenResolution& resolution, |
+ bool virtual_terminal) override; |
+ void DisconnectTerminal(DesktopSessionProxy* desktop_session_proxy) override; |
+ void SetScreenResolution(DesktopSessionProxy* desktop_session_proxy, |
+ const ScreenResolution& resolution) override; |
+ void OnDesktopSessionAgentAttached( |
int terminal_id, |
base::ProcessHandle desktop_process, |
IPC::PlatformFileForTransit desktop_pipe) override; |
- virtual void OnTerminalDisconnected(int terminal_id) override; |
+ void OnTerminalDisconnected(int terminal_id) override; |
private: |
// Used to run the audio capturer. |