diff options
author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 06:44:23 +0000 |
---|---|---|
committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 06:44:23 +0000 |
commit | 1eb55358ccdb0c36b093cf3bb754a603a0449d7b (patch) | |
tree | bdc10e2d08d1c95f35c47a6008822504591d36a5 /remoting/protocol | |
parent | f88c2e097ceb2857cd36babc608ba9845ef0eab8 (diff) | |
download | chromium_src-1eb55358ccdb0c36b093cf3bb754a603a0449d7b.zip chromium_src-1eb55358ccdb0c36b093cf3bb754a603a0449d7b.tar.gz chromium_src-1eb55358ccdb0c36b093cf3bb754a603a0449d7b.tar.bz2 |
Cleanup: Remove unneeded forward declarations from remoting.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8536002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109593 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
-rw-r--r-- | remoting/protocol/buffered_socket_writer.h | 6 | ||||
-rw-r--r-- | remoting/protocol/client_control_sender.h | 8 | ||||
-rw-r--r-- | remoting/protocol/client_message_dispatcher.h | 2 | ||||
-rw-r--r-- | remoting/protocol/connection_to_host.h | 2 | ||||
-rw-r--r-- | remoting/protocol/host_message_dispatcher.h | 4 | ||||
-rw-r--r-- | remoting/protocol/host_stub.h | 6 | ||||
-rw-r--r-- | remoting/protocol/input_stub.h | 6 | ||||
-rw-r--r-- | remoting/protocol/jingle_datagram_connector.h | 6 | ||||
-rw-r--r-- | remoting/protocol/jingle_stream_connector.h | 6 | ||||
-rw-r--r-- | remoting/protocol/pepper_session.h | 11 | ||||
-rw-r--r-- | remoting/protocol/pepper_stream_channel.h | 3 | ||||
-rw-r--r-- | remoting/protocol/pepper_transport_socket_adapter.h | 1 | ||||
-rw-r--r-- | remoting/protocol/protocol_mock_objects.h | 4 | ||||
-rw-r--r-- | remoting/protocol/rtcp_writer.h | 6 | ||||
-rw-r--r-- | remoting/protocol/session.h | 2 | ||||
-rw-r--r-- | remoting/protocol/session_manager.h | 2 | ||||
-rw-r--r-- | remoting/protocol/util.h | 4 | ||||
-rw-r--r-- | remoting/protocol/video_reader.h | 3 |
18 files changed, 22 insertions, 60 deletions
diff --git a/remoting/protocol/buffered_socket_writer.h b/remoting/protocol/buffered_socket_writer.h index 4fd7f79..5aa083f 100644 --- a/remoting/protocol/buffered_socket_writer.h +++ b/remoting/protocol/buffered_socket_writer.h @@ -13,8 +13,6 @@ #include "net/base/io_buffer.h" #include "net/socket/socket.h" -class Task; - namespace base { class MessageLoopProxy; } // namespace base @@ -108,7 +106,7 @@ class BufferedSocketWriterBase class BufferedSocketWriter : public BufferedSocketWriterBase { public: - BufferedSocketWriter(base::MessageLoopProxy* message_loop); + explicit BufferedSocketWriter(base::MessageLoopProxy* message_loop); virtual ~BufferedSocketWriter(); protected: @@ -122,7 +120,7 @@ class BufferedSocketWriter : public BufferedSocketWriterBase { class BufferedDatagramWriter : public BufferedSocketWriterBase { public: - BufferedDatagramWriter(base::MessageLoopProxy* message_loop); + explicit BufferedDatagramWriter(base::MessageLoopProxy* message_loop); virtual ~BufferedDatagramWriter(); protected: diff --git a/remoting/protocol/client_control_sender.h b/remoting/protocol/client_control_sender.h index b26e995..f563e89 100644 --- a/remoting/protocol/client_control_sender.h +++ b/remoting/protocol/client_control_sender.h @@ -9,16 +9,14 @@ // // This class can be used on any thread. -#ifndef REMOTING_PROTOCOL_CLIENT_STUB_IMPL_H_ -#define REMOTING_PROTOCOL_CLIENT_STUB_IMPL_H_ +#ifndef REMOTING_PROTOCOL_CLIENT_CONTROL_SENDER_H_ +#define REMOTING_PROTOCOL_CLIENT_CONTROL_SENDER_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "remoting/protocol/client_stub.h" -class Task; - namespace base { class MessageLoopProxy; } // namespace base @@ -56,4 +54,4 @@ class ClientControlSender : public ClientStub { } // namespace protocol } // namespace remoting -#endif // REMOTING_PROTOCOL_CLIENT_STUB_IMPL_H_ +#endif // REMOTING_PROTOCOL_CLIENT_CONTROL_SENDER_H_ diff --git a/remoting/protocol/client_message_dispatcher.h b/remoting/protocol/client_message_dispatcher.h index 47227af..cbc9405 100644 --- a/remoting/protocol/client_message_dispatcher.h +++ b/remoting/protocol/client_message_dispatcher.h @@ -11,8 +11,6 @@ namespace remoting { -class EventMessage; - namespace protocol { class ClientStub; diff --git a/remoting/protocol/connection_to_host.h b/remoting/protocol/connection_to_host.h index c7cc0d0..dcca294 100644 --- a/remoting/protocol/connection_to_host.h +++ b/remoting/protocol/connection_to_host.h @@ -26,14 +26,12 @@ class Instance; namespace remoting { -class JingleThread; class XmppProxy; class VideoPacket; namespace protocol { class ClientMessageDispatcher; -class ClientControlSender; class ClientStub; class HostControlSender; class HostStub; diff --git a/remoting/protocol/host_message_dispatcher.h b/remoting/protocol/host_message_dispatcher.h index 0b95e46..a1b941b 100644 --- a/remoting/protocol/host_message_dispatcher.h +++ b/remoting/protocol/host_message_dispatcher.h @@ -10,10 +10,6 @@ #include "base/task.h" #include "remoting/protocol/message_reader.h" -namespace base { -class MessageLoopProxy; -} // namespace base - namespace remoting { namespace protocol { diff --git a/remoting/protocol/host_stub.h b/remoting/protocol/host_stub.h index 9d4b796..a52429a 100644 --- a/remoting/protocol/host_stub.h +++ b/remoting/protocol/host_stub.h @@ -11,15 +11,13 @@ #include "base/basictypes.h" -class Task; - namespace remoting { namespace protocol { class HostStub { public: - HostStub() {}; - virtual ~HostStub() {}; + HostStub() {} + virtual ~HostStub() {} // Currently we don't use the control channel for anything. Add new // message handlers here when necessary. diff --git a/remoting/protocol/input_stub.h b/remoting/protocol/input_stub.h index 5db53ee..b7ec67e 100644 --- a/remoting/protocol/input_stub.h +++ b/remoting/protocol/input_stub.h @@ -10,8 +10,6 @@ #include "base/basictypes.h" -class Task; - namespace remoting { namespace protocol { @@ -20,8 +18,8 @@ class MouseEvent; class InputStub { public: - InputStub() {}; - virtual ~InputStub() {}; + InputStub() {} + virtual ~InputStub() {} virtual void InjectKeyEvent(const KeyEvent& event) = 0; virtual void InjectMouseEvent(const MouseEvent& event) = 0; diff --git a/remoting/protocol/jingle_datagram_connector.h b/remoting/protocol/jingle_datagram_connector.h index dafdb0d..bbd7e944 100644 --- a/remoting/protocol/jingle_datagram_connector.h +++ b/remoting/protocol/jingle_datagram_connector.h @@ -5,14 +5,12 @@ #ifndef REMOTING_PROTOCOL_JINGLE_DATAGRAM_CONNECTOR_H_ #define REMOTING_PROTOCOL_JINGLE_DATAGRAM_CONNECTOR_H_ +#include <string> + #include "net/base/completion_callback.h" #include "remoting/protocol/jingle_channel_connector.h" #include "remoting/protocol/session.h" -namespace cricket { -class TransportChannel; -} // namespace cricket - namespace jingle_glue { class TransportChannelSocketAdapter; } // namespace jingle_glue diff --git a/remoting/protocol/jingle_stream_connector.h b/remoting/protocol/jingle_stream_connector.h index d443ffd..8aec6fb 100644 --- a/remoting/protocol/jingle_stream_connector.h +++ b/remoting/protocol/jingle_stream_connector.h @@ -5,6 +5,8 @@ #ifndef REMOTING_PROTOCOL_JINGLE_STREAM_CONNECTOR_H_ #define REMOTING_PROTOCOL_JINGLE_STREAM_CONNECTOR_H_ +#include <string> + #include "base/memory/scoped_ptr.h" #include "net/base/completion_callback.h" #include "remoting/protocol/channel_authenticator.h" @@ -15,10 +17,6 @@ namespace cricket { class TransportChannel; } // namespace cricket -namespace jingle_glue { -class TransportChannelSocketAdapter; -} // namespace jingle_glue - namespace net { class CertVerifier; class StreamSocket; diff --git a/remoting/protocol/pepper_session.h b/remoting/protocol/pepper_session.h index 861ff8d..d44112a 100644 --- a/remoting/protocol/pepper_session.h +++ b/remoting/protocol/pepper_session.h @@ -5,6 +5,7 @@ #ifndef REMOTING_PROTOCOL_PEPPER_SESSION_H_ #define REMOTING_PROTOCOL_PEPPER_SESSION_H_ +#include <list> #include <map> #include <string> @@ -17,17 +18,10 @@ #include "remoting/protocol/session_config.h" namespace net { -class CertVerifier; -class ClientSocketFactory; class Socket; class StreamSocket; -class X509Certificate; } // namespace net -namespace pp { -class Instance; -} // namespace pp - namespace remoting { class IqRequest; @@ -36,7 +30,6 @@ namespace protocol { class PepperChannel; class PepperSessionManager; -class SocketWrapper; // Implements the protocol::Session interface using the Pepper P2P // Transport API. Created by PepperSessionManager for incoming and @@ -75,7 +68,7 @@ class PepperSession : public Session { typedef std::map<std::string, PepperChannel*> ChannelsMap; - PepperSession(PepperSessionManager* session_manager); + explicit PepperSession(PepperSessionManager* session_manager); // Start cs connection by sending session-initiate message. void StartConnection(const std::string& peer_jid, diff --git a/remoting/protocol/pepper_stream_channel.h b/remoting/protocol/pepper_stream_channel.h index d0f7bb2..4041a68 100644 --- a/remoting/protocol/pepper_stream_channel.h +++ b/remoting/protocol/pepper_stream_channel.h @@ -5,6 +5,8 @@ #ifndef REMOTING_PROTOCOL_PEPPER_STREAM_CHANNEL_H_ #define REMOTING_PROTOCOL_PEPPER_STREAM_CHANNEL_H_ +#include <string> + #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "net/base/completion_callback.h" @@ -17,7 +19,6 @@ namespace net { class CertVerifier; class StreamSocket; class SSLClientSocket; -class SSLServerSocket; } // namespace net namespace remoting { diff --git a/remoting/protocol/pepper_transport_socket_adapter.h b/remoting/protocol/pepper_transport_socket_adapter.h index d7e49c9..881d612 100644 --- a/remoting/protocol/pepper_transport_socket_adapter.h +++ b/remoting/protocol/pepper_transport_socket_adapter.h @@ -16,7 +16,6 @@ #include "ppapi/cpp/completion_callback.h" namespace pp { -class Instance; class Transport_Dev; } // namespace pp diff --git a/remoting/protocol/protocol_mock_objects.h b/remoting/protocol/protocol_mock_objects.h index 9a3f50d..3a06c1d 100644 --- a/remoting/protocol/protocol_mock_objects.h +++ b/remoting/protocol/protocol_mock_objects.h @@ -5,6 +5,8 @@ #ifndef REMOTING_PROTOCOL_PROTOCOL_MOCK_OBJECTS_H_ #define REMOTING_PROTOCOL_PROTOCOL_MOCK_OBJECTS_H_ +#include <string> + #include "remoting/proto/internal.pb.h" #include "remoting/protocol/client_stub.h" #include "remoting/protocol/connection_to_client.h" @@ -17,8 +19,6 @@ namespace remoting { namespace protocol { -class ChromotocolConnection; - class MockConnectionToClient : public ConnectionToClient { public: MockConnectionToClient(Session* session, diff --git a/remoting/protocol/rtcp_writer.h b/remoting/protocol/rtcp_writer.h index 7ae49dd..ff7d9cd 100644 --- a/remoting/protocol/rtcp_writer.h +++ b/remoting/protocol/rtcp_writer.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -13,8 +13,6 @@ class MessageLoopProxy; namespace remoting { -class CompoundBuffer; - namespace protocol { class BufferedDatagramWriter; @@ -22,7 +20,7 @@ struct RtcpReceiverReport; class RtcpWriter { public: - RtcpWriter(base::MessageLoopProxy* message_loop); + explicit RtcpWriter(base::MessageLoopProxy* message_loop); virtual ~RtcpWriter(); // Initializes the writer. Must be called on the thread the socket diff --git a/remoting/protocol/session.h b/remoting/protocol/session.h index 432b948..e0a91a0 100644 --- a/remoting/protocol/session.h +++ b/remoting/protocol/session.h @@ -12,8 +12,6 @@ #include "remoting/protocol/buffered_socket_writer.h" #include "remoting/protocol/session_config.h" -class Task; - namespace net { class Socket; class StreamSocket; diff --git a/remoting/protocol/session_manager.h b/remoting/protocol/session_manager.h index 65f6649..f36abd2 100644 --- a/remoting/protocol/session_manager.h +++ b/remoting/protocol/session_manager.h @@ -52,8 +52,6 @@ #include "base/threading/non_thread_safe.h" #include "remoting/protocol/session.h" -class Task; - namespace crypto { class RSAPrivateKey; } // namespace base diff --git a/remoting/protocol/util.h b/remoting/protocol/util.h index 802e65c..a40a9aa 100644 --- a/remoting/protocol/util.h +++ b/remoting/protocol/util.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,8 +11,6 @@ #include "net/base/io_buffer.h" #include "third_party/protobuf/src/google/protobuf/message_lite.h" -class Task; - namespace remoting { namespace protocol { diff --git a/remoting/protocol/video_reader.h b/remoting/protocol/video_reader.h index ada9c30..a7860eb 100644 --- a/remoting/protocol/video_reader.h +++ b/remoting/protocol/video_reader.h @@ -17,9 +17,6 @@ class MessageLoopProxy; } // namespace base namespace remoting { - -class ChromotocolConnection; - namespace protocol { class Session; |