From 11d989c52c6da43c5e8eb9d377ef0286a1cc8fba Mon Sep 17 00:00:00 2001 From: mostynb Date: Wed, 8 Oct 2014 09:58:09 -0700 Subject: 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} --- remoting/host/win/chromoting_module.h | 2 +- remoting/host/win/host_service.h | 4 ++-- remoting/host/win/rdp_client.cc | 4 ++-- remoting/host/win/rdp_client_unittest.cc | 4 ++-- remoting/host/win/rdp_desktop_session.h | 4 ++-- remoting/host/win/session_desktop_environment.h | 4 ++-- remoting/host/win/session_input_injector.cc | 10 +++++----- remoting/host/win/session_input_injector.h | 10 +++++----- remoting/host/win/unprivileged_process_delegate.h | 14 +++++++------- remoting/host/win/worker_process_launcher.h | 2 +- remoting/host/win/worker_process_launcher_unittest.cc | 12 ++++++------ remoting/host/win/wts_session_process_delegate.cc | 8 ++++---- remoting/host/win/wts_session_process_delegate.h | 8 ++++---- 13 files changed, 43 insertions(+), 43 deletions(-) (limited to 'remoting/host/win') diff --git a/remoting/host/win/chromoting_module.h b/remoting/host/win/chromoting_module.h index 2c7f1aa..d124516 100644 --- a/remoting/host/win/chromoting_module.h +++ b/remoting/host/win/chromoting_module.h @@ -47,7 +47,7 @@ class ChromotingModule : public ATL::CAtlModuleT { bool Run(); // ATL::CAtlModuleT<> overrides - virtual LONG Unlock() OVERRIDE; + virtual LONG Unlock() override; DECLARE_LIBID(LIBID_ChromotingLib) diff --git a/remoting/host/win/host_service.h b/remoting/host/win/host_service.h index ccd92f7..96cfff2 100644 --- a/remoting/host/win/host_service.h +++ b/remoting/host/win/host_service.h @@ -38,9 +38,9 @@ class HostService : public WtsTerminalMonitor { // WtsTerminalMonitor implementation virtual bool AddWtsTerminalObserver(const std::string& terminal_id, - WtsTerminalObserver* observer) OVERRIDE; + WtsTerminalObserver* observer) override; virtual void RemoveWtsTerminalObserver( - WtsTerminalObserver* observer) OVERRIDE; + WtsTerminalObserver* observer) override; private: HostService(); diff --git a/remoting/host/win/rdp_client.cc b/remoting/host/win/rdp_client.cc index ef7f74e..80868da 100644 --- a/remoting/host/win/rdp_client.cc +++ b/remoting/host/win/rdp_client.cc @@ -56,8 +56,8 @@ class RdpClient::Core void InjectSas(); // RdpClientWindow::EventHandler interface. - virtual void OnConnected() OVERRIDE; - virtual void OnDisconnected() OVERRIDE; + virtual void OnConnected() override; + virtual void OnDisconnected() override; private: friend class base::RefCountedThreadSafe; diff --git a/remoting/host/win/rdp_client_unittest.cc b/remoting/host/win/rdp_client_unittest.cc index ac541a1..4ef67b6 100644 --- a/remoting/host/win/rdp_client_unittest.cc +++ b/remoting/host/win/rdp_client_unittest.cc @@ -81,8 +81,8 @@ class RdpClientTest : public testing::Test { RdpClientTest(); virtual ~RdpClientTest(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; // Caaled when an RDP connection is established. void OnRdpConnected(); diff --git a/remoting/host/win/rdp_desktop_session.h b/remoting/host/win/rdp_desktop_session.h index 682c3f5..9f08692 100644 --- a/remoting/host/win/rdp_desktop_session.h +++ b/remoting/host/win/rdp_desktop_session.h @@ -49,8 +49,8 @@ class __declspec(uuid(RDP_DESKTOP_SESSION_CLSID)) RdpDesktopSession private: // RdpClient::EventHandler interface. - virtual void OnRdpConnected() OVERRIDE; - virtual void OnRdpClosed() OVERRIDE; + virtual void OnRdpConnected() override; + virtual void OnRdpClosed() override; BEGIN_COM_MAP(RdpDesktopSession) COM_INTERFACE_ENTRY(IRdpDesktopSession) diff --git a/remoting/host/win/session_desktop_environment.h b/remoting/host/win/session_desktop_environment.h index 7d14413..949fa5e 100644 --- a/remoting/host/win/session_desktop_environment.h +++ b/remoting/host/win/session_desktop_environment.h @@ -20,7 +20,7 @@ class SessionDesktopEnvironment : public Me2MeDesktopEnvironment { virtual ~SessionDesktopEnvironment(); // DesktopEnvironment implementation. - virtual scoped_ptr CreateInputInjector() OVERRIDE; + virtual scoped_ptr CreateInputInjector() override; private: friend class SessionDesktopEnvironmentFactory; @@ -48,7 +48,7 @@ class SessionDesktopEnvironmentFactory : public Me2MeDesktopEnvironmentFactory { // DesktopEnvironmentFactory implementation. virtual scoped_ptr Create( - base::WeakPtr client_session_control) OVERRIDE; + base::WeakPtr client_session_control) override; private: // Used to ask the daemon to inject Secure Attention Sequence. diff --git a/remoting/host/win/session_input_injector.cc b/remoting/host/win/session_input_injector.cc index 2c4ee23..784d0ff 100644 --- a/remoting/host/win/session_input_injector.cc +++ b/remoting/host/win/session_input_injector.cc @@ -56,16 +56,16 @@ class SessionInputInjectorWin::Core // InputInjector implementation. virtual void Start( - scoped_ptr client_clipboard) OVERRIDE; + scoped_ptr client_clipboard) override; // protocol::ClipboardStub implementation. virtual void InjectClipboardEvent( - const protocol::ClipboardEvent& event) OVERRIDE; + const protocol::ClipboardEvent& event) override; // protocol::InputStub implementation. - 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 InjectKeyEvent(const protocol::KeyEvent& event) override; + virtual void InjectTextEvent(const protocol::TextEvent& event) override; + virtual void InjectMouseEvent(const protocol::MouseEvent& event) override; private: friend class base::RefCountedThreadSafe; diff --git a/remoting/host/win/session_input_injector.h b/remoting/host/win/session_input_injector.h index 9c9443c..ce58c94 100644 --- a/remoting/host/win/session_input_injector.h +++ b/remoting/host/win/session_input_injector.h @@ -33,16 +33,16 @@ class SessionInputInjectorWin : public InputInjector { // InputInjector implementation. virtual void Start( - scoped_ptr client_clipboard) OVERRIDE; + scoped_ptr client_clipboard) override; // protocol::ClipboardStub implementation. virtual void InjectClipboardEvent( - const protocol::ClipboardEvent& event) OVERRIDE; + const protocol::ClipboardEvent& event) override; // protocol::InputStub implementation. - 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 InjectKeyEvent(const protocol::KeyEvent& event) override; + virtual void InjectTextEvent(const protocol::TextEvent& event) override; + virtual void InjectMouseEvent(const protocol::MouseEvent& event) override; private: // The actual implementation resides in SessionInputInjectorWin::Core class. diff --git a/remoting/host/win/unprivileged_process_delegate.h b/remoting/host/win/unprivileged_process_delegate.h index 435958c..74cd8ea 100644 --- a/remoting/host/win/unprivileged_process_delegate.h +++ b/remoting/host/win/unprivileged_process_delegate.h @@ -40,16 +40,16 @@ class UnprivilegedProcessDelegate virtual ~UnprivilegedProcessDelegate(); // WorkerProcessLauncher::Delegate implementation. - virtual void LaunchProcess(WorkerProcessLauncher* event_handler) OVERRIDE; - virtual void Send(IPC::Message* message) OVERRIDE; - virtual void CloseChannel() OVERRIDE; - virtual void KillProcess() OVERRIDE; + virtual void LaunchProcess(WorkerProcessLauncher* event_handler) override; + virtual void Send(IPC::Message* message) override; + virtual void CloseChannel() override; + virtual void KillProcess() override; private: // IPC::Listener implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; - virtual void OnChannelError() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void OnChannelConnected(int32 peer_pid) override; + virtual void OnChannelError() override; void ReportFatalError(); void ReportProcessLaunched(base::win::ScopedHandle worker_process); diff --git a/remoting/host/win/worker_process_launcher.h b/remoting/host/win/worker_process_launcher.h index 03fd45b..a61b755 100644 --- a/remoting/host/win/worker_process_launcher.h +++ b/remoting/host/win/worker_process_launcher.h @@ -102,7 +102,7 @@ class WorkerProcessLauncher // base::win::ObjectWatcher::Delegate implementation used to watch for // the worker process exiting. - virtual void OnObjectSignaled(HANDLE object) OVERRIDE; + virtual void OnObjectSignaled(HANDLE object) override; // Returns true when the object is being destroyed. bool stopping() const { return ipc_handler_ == NULL; } diff --git a/remoting/host/win/worker_process_launcher_unittest.cc b/remoting/host/win/worker_process_launcher_unittest.cc index 0c93a83..e256a7c 100644 --- a/remoting/host/win/worker_process_launcher_unittest.cc +++ b/remoting/host/win/worker_process_launcher_unittest.cc @@ -76,7 +76,7 @@ class MockWorkerListener : public IPC::Listener { MOCK_METHOD3(OnCrash, void(const std::string&, const std::string&, int)); // IPC::Listener implementation - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; private: DISALLOW_COPY_AND_ASSIGN(MockWorkerListener); @@ -103,13 +103,13 @@ class WorkerProcessLauncherTest WorkerProcessLauncherTest(); virtual ~WorkerProcessLauncherTest(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; // IPC::Listener implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; - virtual void OnChannelError() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void OnChannelConnected(int32 peer_pid) override; + virtual void OnChannelError() override; // WorkerProcessLauncher::Delegate mocks void LaunchProcess( diff --git a/remoting/host/win/wts_session_process_delegate.cc b/remoting/host/win/wts_session_process_delegate.cc index c05ac90..a28ac5a 100644 --- a/remoting/host/win/wts_session_process_delegate.cc +++ b/remoting/host/win/wts_session_process_delegate.cc @@ -68,12 +68,12 @@ class WtsSessionProcessDelegate::Core // base::MessagePumpForIO::IOHandler implementation. virtual void OnIOCompleted(base::MessagePumpForIO::IOContext* context, DWORD bytes_transferred, - DWORD error) OVERRIDE; + DWORD error) override; // IPC::Listener implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; - virtual void OnChannelError() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void OnChannelConnected(int32 peer_pid) override; + virtual void OnChannelError() override; // The actual implementation of LaunchProcess() void DoLaunchProcess(); diff --git a/remoting/host/win/wts_session_process_delegate.h b/remoting/host/win/wts_session_process_delegate.h index cfe856e..625c846 100644 --- a/remoting/host/win/wts_session_process_delegate.h +++ b/remoting/host/win/wts_session_process_delegate.h @@ -40,10 +40,10 @@ class WtsSessionProcessDelegate bool Initialize(uint32 session_id); // WorkerProcessLauncher::Delegate implementation. - virtual void LaunchProcess(WorkerProcessLauncher* event_handler) OVERRIDE; - virtual void Send(IPC::Message* message) OVERRIDE; - virtual void CloseChannel() OVERRIDE; - virtual void KillProcess() OVERRIDE; + virtual void LaunchProcess(WorkerProcessLauncher* event_handler) override; + virtual void Send(IPC::Message* message) override; + virtual void CloseChannel() override; + virtual void KillProcess() override; private: // The actual implementation resides in WtsSessionProcessDelegate::Core class. -- cgit v1.1