diff options
| author | mostynb <mostynb@opera.com> | 2014-10-08 09:58:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-08 16:59:03 +0000 |
| commit | 11d989c52c6da43c5e8eb9d377ef0286a1cc8fba (patch) | |
| tree | f2cb68b6b799bbfcdce2a51e72f69aa0164bb845 /remoting/host/basic_desktop_environment.h | |
| parent | c9d7a691bb7a1c5cfeeddfc29f227215a9338045 (diff) | |
| download | chromium_src-11d989c52c6da43c5e8eb9d377ef0286a1cc8fba.zip chromium_src-11d989c52c6da43c5e8eb9d377ef0286a1cc8fba.tar.gz chromium_src-11d989c52c6da43c5e8eb9d377ef0286a1cc8fba.tar.bz2 | |
replace OVERRIDE and FINAL with override and final in remoting/
BUG=417463
Review URL: https://codereview.chromium.org/628753002
Cr-Commit-Position: refs/heads/master@{#298734}
Diffstat (limited to 'remoting/host/basic_desktop_environment.h')
| -rw-r--r-- | remoting/host/basic_desktop_environment.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/remoting/host/basic_desktop_environment.h b/remoting/host/basic_desktop_environment.h index 543ad90..a5416b2 100644 --- a/remoting/host/basic_desktop_environment.h +++ b/remoting/host/basic_desktop_environment.h @@ -30,16 +30,16 @@ class BasicDesktopEnvironment : public DesktopEnvironment { virtual ~BasicDesktopEnvironment(); // 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; protected: friend class BasicDesktopEnvironmentFactory; @@ -96,7 +96,7 @@ class BasicDesktopEnvironmentFactory : public DesktopEnvironmentFactory { virtual ~BasicDesktopEnvironmentFactory(); // DesktopEnvironmentFactory implementation. - virtual bool SupportsAudioCapture() const OVERRIDE; + virtual bool SupportsAudioCapture() const override; protected: scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner() const { |