Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(376)

Unified Diff: remoting/host/fake_desktop_environment.h

Issue 628753002: replace OVERRIDE and FINAL with override and final in remoting/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/fake_desktop_capturer.h ('k') | remoting/host/fake_host_extension.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/fake_desktop_environment.h
diff --git a/remoting/host/fake_desktop_environment.h b/remoting/host/fake_desktop_environment.h
index 91fd9bb47f68909e049ca234f5a640ca216b7ff6..64d293a8487995fab8f1437914f856843728306b 100644
--- a/remoting/host/fake_desktop_environment.h
+++ b/remoting/host/fake_desktop_environment.h
@@ -19,12 +19,12 @@ class FakeInputInjector : public InputInjector {
virtual ~FakeInputInjector();
virtual void Start(
- scoped_ptr<protocol::ClipboardStub> client_clipboard) OVERRIDE;
- virtual void InjectKeyEvent(const protocol::KeyEvent& event) OVERRIDE;
- virtual void InjectTextEvent(const protocol::TextEvent& event) OVERRIDE;
- virtual void InjectMouseEvent(const protocol::MouseEvent& event) OVERRIDE;
+ scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
+ virtual void InjectKeyEvent(const protocol::KeyEvent& event) override;
+ virtual void InjectTextEvent(const protocol::TextEvent& event) override;
+ virtual void InjectMouseEvent(const protocol::MouseEvent& event) override;
virtual void InjectClipboardEvent(
- const protocol::ClipboardEvent& event) OVERRIDE;
+ const protocol::ClipboardEvent& event) override;
};
class FakeScreenControls : public ScreenControls {
@@ -33,7 +33,7 @@ class FakeScreenControls : public ScreenControls {
virtual ~FakeScreenControls();
// ScreenControls implementation.
- virtual void SetScreenResolution(const ScreenResolution& resolution) OVERRIDE;
+ virtual void SetScreenResolution(const ScreenResolution& resolution) override;
};
class FakeDesktopEnvironment : public DesktopEnvironment {
@@ -49,16 +49,16 @@ class FakeDesktopEnvironment : public DesktopEnvironment {
}
// 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:
FakeDesktopCapturer::FrameGenerator frame_generator_;
@@ -80,10 +80,10 @@ class FakeDesktopEnvironmentFactory : public DesktopEnvironmentFactory {
// 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;
- virtual void SetEnableGnubbyAuth(bool enable) OVERRIDE;
+ base::WeakPtr<ClientSessionControl> client_session_control) override;
+ virtual void SetEnableCurtaining(bool enable) override;
+ virtual bool SupportsAudioCapture() const override;
+ virtual void SetEnableGnubbyAuth(bool enable) override;
private:
FakeDesktopCapturer::FrameGenerator frame_generator_;
« no previous file with comments | « remoting/host/fake_desktop_capturer.h ('k') | remoting/host/fake_host_extension.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698