| Index: remoting/host/ipc_desktop_environment.h
|
| diff --git a/remoting/host/ipc_desktop_environment.h b/remoting/host/ipc_desktop_environment.h
|
| index b5f5420455e5935a47178401121991d50c868fc8..8490780ebb903865c581cea69262f3ee155d6e72 100644
|
| --- a/remoting/host/ipc_desktop_environment.h
|
| +++ b/remoting/host/ipc_desktop_environment.h
|
| @@ -49,16 +49,16 @@ class IpcDesktopEnvironment : public DesktopEnvironment {
|
| virtual ~IpcDesktopEnvironment();
|
|
|
| // 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<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;
|
| + override;
|
| + virtual std::string GetCapabilities() const override;
|
| + virtual void SetCapabilities(const std::string& capabilities) override;
|
| virtual scoped_ptr<GnubbyAuthHandler> CreateGnubbyAuthHandler(
|
| - protocol::ClientStub* client_stub) OVERRIDE;
|
| + protocol::ClientStub* client_stub) override;
|
|
|
| private:
|
| scoped_refptr<DesktopSessionProxy> desktop_session_proxy_;
|
| @@ -84,25 +84,25 @@ class IpcDesktopEnvironmentFactory
|
|
|
| // DesktopEnvironmentFactory implementation.
|
| virtual scoped_ptr<DesktopEnvironment> Create(
|
| - base::WeakPtr<ClientSessionControl> client_session_control) OVERRIDE;
|
| - virtual void SetEnableCurtaining(bool enable) OVERRIDE;
|
| - virtual bool SupportsAudioCapture() const OVERRIDE;
|
| + base::WeakPtr<ClientSessionControl> client_session_control) override;
|
| + virtual void SetEnableCurtaining(bool enable) override;
|
| + virtual bool SupportsAudioCapture() const override;
|
|
|
| // DesktopSessionConnector implementation.
|
| virtual void ConnectTerminal(
|
| DesktopSessionProxy* desktop_session_proxy,
|
| const ScreenResolution& resolution,
|
| - bool virtual_terminal) OVERRIDE;
|
| + bool virtual_terminal) override;
|
| virtual void DisconnectTerminal(
|
| - DesktopSessionProxy* desktop_session_proxy) OVERRIDE;
|
| + DesktopSessionProxy* desktop_session_proxy) override;
|
| virtual void SetScreenResolution(
|
| DesktopSessionProxy* desktop_session_proxy,
|
| - const ScreenResolution& resolution) OVERRIDE;
|
| + const ScreenResolution& resolution) override;
|
| virtual void OnDesktopSessionAgentAttached(
|
| int terminal_id,
|
| base::ProcessHandle desktop_process,
|
| - IPC::PlatformFileForTransit desktop_pipe) OVERRIDE;
|
| - virtual void OnTerminalDisconnected(int terminal_id) OVERRIDE;
|
| + IPC::PlatformFileForTransit desktop_pipe) override;
|
| + virtual void OnTerminalDisconnected(int terminal_id) override;
|
|
|
| private:
|
| // Used to run the audio capturer.
|
|
|