| Index: remoting/host/security_key/security_key_message_reader_impl.h
|
| diff --git a/remoting/host/security_key/remote_security_key_message_reader_impl.h b/remoting/host/security_key/security_key_message_reader_impl.h
|
| similarity index 65%
|
| rename from remoting/host/security_key/remote_security_key_message_reader_impl.h
|
| rename to remoting/host/security_key/security_key_message_reader_impl.h
|
| index 051fc3338e6e3b6b7acc4b898685275f83c80588..f36e5127b5f34224f76dedc7ab9692f14a92095b 100644
|
| --- a/remoting/host/security_key/remote_security_key_message_reader_impl.h
|
| +++ b/remoting/host/security_key/security_key_message_reader_impl.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef REMOTING_HOST_SECURITY_KEY_REMOTE_SECURITY_KEY_MESSAGE_READER_IMPL_H_
|
| -#define REMOTING_HOST_SECURITY_KEY_REMOTE_SECURITY_KEY_MESSAGE_READER_IMPL_H_
|
| +#ifndef REMOTING_HOST_SECURITY_KEY_SECURITY_KEY_MESSAGE_READER_IMPL_H_
|
| +#define REMOTING_HOST_SECURITY_KEY_SECURITY_KEY_MESSAGE_READER_IMPL_H_
|
|
|
| #include <memory>
|
|
|
| @@ -12,8 +12,8 @@
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/threading/thread.h"
|
| -#include "remoting/host/security_key/remote_security_key_message_reader.h"
|
| #include "remoting/host/security_key/security_key_message.h"
|
| +#include "remoting/host/security_key/security_key_message_reader.h"
|
|
|
| namespace base {
|
| class SingleThreadTaskRunner;
|
| @@ -21,20 +21,19 @@ class SingleThreadTaskRunner;
|
|
|
| namespace remoting {
|
|
|
| -// RemoteSecurityKeyMessageReader implementation that receives messages from
|
| +// SecurityKeyMessageReader implementation that receives messages from
|
| // a pipe.
|
| -class RemoteSecurityKeyMessageReaderImpl
|
| - : public RemoteSecurityKeyMessageReader {
|
| +class SecurityKeyMessageReaderImpl : public SecurityKeyMessageReader {
|
| public:
|
| - explicit RemoteSecurityKeyMessageReaderImpl(base::File input_file);
|
| - ~RemoteSecurityKeyMessageReaderImpl() override;
|
| + explicit SecurityKeyMessageReaderImpl(base::File input_file);
|
| + ~SecurityKeyMessageReaderImpl() override;
|
|
|
| - // RemoteSecurityKeyMessageReader interface.
|
| + // SecurityKeyMessageReader interface.
|
| void Start(const SecurityKeyMessageCallback& message_callback,
|
| const base::Closure& error_callback) override;
|
|
|
| private:
|
| - // Reads a message from the remote security key process and passes it to
|
| + // Reads a message from the remote_security_key process and passes it to
|
| // |message_callback_| on the originating thread. Run on |read_task_runner_|.
|
| void ReadMessage();
|
|
|
| @@ -61,12 +60,12 @@ class RemoteSecurityKeyMessageReaderImpl
|
| scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
|
| scoped_refptr<base::SingleThreadTaskRunner> read_task_runner_;
|
|
|
| - base::WeakPtr<RemoteSecurityKeyMessageReaderImpl> reader_;
|
| - base::WeakPtrFactory<RemoteSecurityKeyMessageReaderImpl> weak_factory_;
|
| + base::WeakPtr<SecurityKeyMessageReaderImpl> reader_;
|
| + base::WeakPtrFactory<SecurityKeyMessageReaderImpl> weak_factory_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(RemoteSecurityKeyMessageReaderImpl);
|
| + DISALLOW_COPY_AND_ASSIGN(SecurityKeyMessageReaderImpl);
|
| };
|
|
|
| } // namespace remoting
|
|
|
| -#endif // REMOTING_HOST_SECURITY_KEY_REMOTE_SECURITY_KEY_MESSAGE_READER_IMPL_H_
|
| +#endif // REMOTING_HOST_SECURITY_KEY_SECURITY_KEY_MESSAGE_READER_IMPL_H_
|
|
|