diff options
Diffstat (limited to 'remoting/host/it2me')
-rw-r--r-- | remoting/host/it2me/it2me_host.h | 8 | ||||
-rw-r--r-- | remoting/host/it2me/it2me_native_messaging_host.h | 20 | ||||
-rw-r--r-- | remoting/host/it2me/it2me_native_messaging_host_unittest.cc | 10 |
3 files changed, 18 insertions, 20 deletions
diff --git a/remoting/host/it2me/it2me_host.h b/remoting/host/it2me/it2me_host.h index c24f2d1..349232d 100644 --- a/remoting/host/it2me/it2me_host.h +++ b/remoting/host/it2me/it2me_host.h @@ -80,16 +80,16 @@ class It2MeHost : public base::RefCountedThreadSafe<It2MeHost>, virtual void RequestNatPolicy(); // remoting::HostStatusObserver implementation. - virtual void OnAccessDenied(const std::string& jid) override; - virtual void OnClientAuthenticated(const std::string& jid) override; - virtual void OnClientDisconnected(const std::string& jid) override; + void OnAccessDenied(const std::string& jid) override; + void OnClientAuthenticated(const std::string& jid) override; + void OnClientDisconnected(const std::string& jid) override; void SetStateForTesting(It2MeHostState state) { SetState(state); } protected: friend class base::RefCountedThreadSafe<It2MeHost>; - virtual ~It2MeHost(); + ~It2MeHost() override; ChromotingHostContext* host_context() { return host_context_; } scoped_refptr<base::SingleThreadTaskRunner> task_runner() { diff --git a/remoting/host/it2me/it2me_native_messaging_host.h b/remoting/host/it2me/it2me_native_messaging_host.h index 18e738b..1780d73 100644 --- a/remoting/host/it2me/it2me_native_messaging_host.h +++ b/remoting/host/it2me/it2me_native_messaging_host.h @@ -25,21 +25,19 @@ class It2MeNativeMessagingHost : public It2MeHost::Observer, public: It2MeNativeMessagingHost(scoped_refptr<AutoThreadTaskRunner> task_runner, scoped_ptr<It2MeHostFactory> factory); - virtual ~It2MeNativeMessagingHost(); + ~It2MeNativeMessagingHost() override; // extensions::NativeMessageHost implementation. - virtual void OnMessage(const std::string& message) override; - virtual void Start(Client* client) override; - virtual scoped_refptr<base::SingleThreadTaskRunner> task_runner() - const override; + void OnMessage(const std::string& message) override; + void Start(Client* client) override; + scoped_refptr<base::SingleThreadTaskRunner> task_runner() const override; // It2MeHost::Observer implementation. - virtual void OnClientAuthenticated(const std::string& client_username) - override; - virtual void OnStoreAccessCode(const std::string& access_code, - base::TimeDelta access_code_lifetime) override; - virtual void OnNatPolicyChanged(bool nat_traversal_enabled) override; - virtual void OnStateChanged(It2MeHostState state) override; + void OnClientAuthenticated(const std::string& client_username) override; + void OnStoreAccessCode(const std::string& access_code, + base::TimeDelta access_code_lifetime) override; + void OnNatPolicyChanged(bool nat_traversal_enabled) override; + void OnStateChanged(It2MeHostState state) override; static std::string HostStateToString(It2MeHostState host_state); diff --git a/remoting/host/it2me/it2me_native_messaging_host_unittest.cc b/remoting/host/it2me/it2me_native_messaging_host_unittest.cc index 61334cf..e0f98f2 100644 --- a/remoting/host/it2me/it2me_native_messaging_host_unittest.cc +++ b/remoting/host/it2me/it2me_native_messaging_host_unittest.cc @@ -79,12 +79,12 @@ class MockIt2MeHost : public It2MeHost { directory_bot_jid) {} // It2MeHost overrides - virtual void Connect() override; - virtual void Disconnect() override; - virtual void RequestNatPolicy() override; + void Connect() override; + void Disconnect() override; + void RequestNatPolicy() override; private: - virtual ~MockIt2MeHost() {} + ~MockIt2MeHost() override {} void RunSetState(It2MeHostState state); @@ -149,7 +149,7 @@ void MockIt2MeHost::RunSetState(It2MeHostState state) { class MockIt2MeHostFactory : public It2MeHostFactory { public: MockIt2MeHostFactory() {} - virtual scoped_refptr<It2MeHost> CreateIt2MeHost( + scoped_refptr<It2MeHost> CreateIt2MeHost( ChromotingHostContext* context, scoped_refptr<base::SingleThreadTaskRunner> task_runner, base::WeakPtr<It2MeHost::Observer> observer, |