summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-15 00:29:48 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-15 00:29:48 +0000
commit320eff44dc909bf0fe575b3bff1df08a2fd99736 (patch)
treed17929f1c501ec3bd661c2cae401fdae1ac44d58
parent97739e9e12cb10a63c75e7f6e65db28cc8101037 (diff)
downloadchromium_src-320eff44dc909bf0fe575b3bff1df08a2fd99736.zip
chromium_src-320eff44dc909bf0fe575b3bff1df08a2fd99736.tar.gz
chromium_src-320eff44dc909bf0fe575b3bff1df08a2fd99736.tar.bz2
Cleanup: Remove unneeded forward declarations in base, dbug, gpu, ipc, jingle, and media.
BUG=none TEST=none Review URL: http://codereview.chromium.org/8511045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109998 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/debug/trace_event_win.h5
-rw-r--r--base/message_loop.h8
-rw-r--r--dbus/exported_object.h8
-rw-r--r--dbus/object_proxy.h5
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.h1
-rw-r--r--gpu/tools/compositor_model_bench/shaders.h2
-rw-r--r--ipc/ipc_sync_channel.h7
-rw-r--r--ipc/ipc_sync_message_filter.h5
-rw-r--r--jingle/notifier/base/resolving_client_socket_factory.h1
-rw-r--r--jingle/notifier/base/xmpp_client_socket_factory.h2
-rw-r--r--jingle/notifier/communicator/login.h1
-rw-r--r--jingle/notifier/communicator/login_settings.h4
-rw-r--r--jingle/notifier/communicator/xmpp_connection_generator.h5
-rw-r--r--media/audio/mac/audio_manager_mac.h3
-rw-r--r--media/audio/win/audio_manager_win.h1
-rw-r--r--media/base/demuxer_stream.h2
-rw-r--r--media/filters/ffmpeg_demuxer.h4
17 files changed, 14 insertions, 50 deletions
diff --git a/base/debug/trace_event_win.h b/base/debug/trace_event_win.h
index c82782c..e465d5b 100644
--- a/base/debug/trace_event_win.h
+++ b/base/debug/trace_event_win.h
@@ -118,10 +118,7 @@ enum TraceEventFlags {
// Optionally the stack trace, consisting of a DWORD "depth", followed
// by an array of void* (machine bitness) of length "depth".
-// Forward decl.
-struct TraceLogSingletonTraits;
-
-} // nemspace debug
+} // namespace debug
} // namespace base
#endif // BASE_DEBUG_TRACE_EVENT_WIN_H_
diff --git a/base/message_loop.h b/base/message_loop.h
index 16e9dd5..c14b663 100644
--- a/base/message_loop.h
+++ b/base/message_loop.h
@@ -45,10 +45,6 @@ namespace base {
class Histogram;
}
-namespace tracked_objects {
-class Births;
-}
-
// A MessageLoop is used to process events for a particular thread. There is
// at most one MessageLoop instance per thread.
//
@@ -692,8 +688,8 @@ class BASE_EXPORT MessageLoopForIO : public MessageLoop {
bool WatchFileDescriptor(int fd,
bool persistent,
Mode mode,
- FileDescriptorWatcher *controller,
- Watcher *delegate);
+ FileDescriptorWatcher* controller,
+ Watcher* delegate);
private:
base::MessagePumpLibevent* pump_io() {
diff --git a/dbus/exported_object.h b/dbus/exported_object.h
index 7dd8ca5..bc67bcd 100644
--- a/dbus/exported_object.h
+++ b/dbus/exported_object.h
@@ -6,20 +6,18 @@
#define DBUS_EXPORTED_OBJECT_H_
#pragma once
-#include <string>
+#include <dbus/dbus.h>
+
#include <map>
+#include <string>
#include <utility>
-#include <dbus/dbus.h>
-
#include "base/callback.h"
#include "base/memory/ref_counted.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/platform_thread.h"
#include "base/time.h"
-class MessageLoop;
-
namespace dbus {
class Bus;
diff --git a/dbus/object_proxy.h b/dbus/object_proxy.h
index 484f107..dcba44d 100644
--- a/dbus/object_proxy.h
+++ b/dbus/object_proxy.h
@@ -6,17 +6,16 @@
#define DBUS_OBJECT_PROXY_H_
#pragma once
+#include <dbus/dbus.h>
+
#include <map>
#include <string>
#include <vector>
-#include <dbus/dbus.h>
#include "base/callback.h"
#include "base/memory/ref_counted.h"
#include "base/time.h"
-class MessageLoop;
-
namespace dbus {
class Bus;
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.h b/gpu/command_buffer/service/gles2_cmd_decoder.h
index fb8534d..c4313ca 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.h
@@ -23,7 +23,6 @@ class GLSurface;
namespace gpu {
class StreamTextureManager;
-class SurfaceManager;
namespace gles2 {
diff --git a/gpu/tools/compositor_model_bench/shaders.h b/gpu/tools/compositor_model_bench/shaders.h
index 0a5dd0e..4594035 100644
--- a/gpu/tools/compositor_model_bench/shaders.h
+++ b/gpu/tools/compositor_model_bench/shaders.h
@@ -12,7 +12,6 @@
// Forward declarations.
class CCNode;
class ContentLayerNode;
-class TextureBuilder;
typedef unsigned int GLuint;
@@ -51,4 +50,3 @@ void DrawQuad(float width, float height);
void DrawTileQuad(GLuint texID, int x, int y);
#endif // GPU_TOOLS_COMPOSITOR_MODEL_BENCH_SHADERS_H_
-
diff --git a/ipc/ipc_sync_channel.h b/ipc/ipc_sync_channel.h
index 29844da..e43933e 100644
--- a/ipc/ipc_sync_channel.h
+++ b/ipc/ipc_sync_channel.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 IPC_IPC_SYNC_SENDER_H__
-#define IPC_IPC_SYNC_SENDER_H__
+#ifndef IPC_IPC_SYNC_CHANNEL_H_
+#define IPC_IPC_SYNC_CHANNEL_H_
#pragma once
#include <string>
@@ -24,7 +24,6 @@ class WaitableEvent;
namespace IPC {
class SyncMessage;
-class MessageReplyDeserializer;
// This is similar to ChannelProxy, with the added feature of supporting sending
// synchronous messages.
@@ -197,4 +196,4 @@ class IPC_EXPORT SyncChannel : public ChannelProxy,
} // namespace IPC
-#endif // IPC_IPC_SYNC_SENDER_H__
+#endif // IPC_IPC_SYNC_CHANNEL_H_
diff --git a/ipc/ipc_sync_message_filter.h b/ipc/ipc_sync_message_filter.h
index cdaef85..4b5b55f 100644
--- a/ipc/ipc_sync_message_filter.h
+++ b/ipc/ipc_sync_message_filter.h
@@ -6,12 +6,13 @@
#define IPC_IPC_SYNC_MESSAGE_FILTER_H_
#pragma once
+#include <set>
+
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "base/synchronization/lock.h"
#include "ipc/ipc_channel_proxy.h"
#include "ipc/ipc_sync_message.h"
-#include <set>
namespace base {
class MessageLoopProxy;
@@ -20,8 +21,6 @@ class WaitableEvent;
namespace IPC {
-class MessageReplyDeserializer;
-
// This MessageFilter allows sending synchronous IPC messages from a thread
// other than the listener thread associated with the SyncChannel. It does not
// support fancy features that SyncChannel does, such as handling recursion or
diff --git a/jingle/notifier/base/resolving_client_socket_factory.h b/jingle/notifier/base/resolving_client_socket_factory.h
index 427c6f0..7f5af1f 100644
--- a/jingle/notifier/base/resolving_client_socket_factory.h
+++ b/jingle/notifier/base/resolving_client_socket_factory.h
@@ -9,7 +9,6 @@
namespace net {
class ClientSocketHandle;
class HostPortPair;
-class NetLog;
class SSLClientSocket;
class StreamSocket;
}
diff --git a/jingle/notifier/base/xmpp_client_socket_factory.h b/jingle/notifier/base/xmpp_client_socket_factory.h
index bb9ae52..7904639 100644
--- a/jingle/notifier/base/xmpp_client_socket_factory.h
+++ b/jingle/notifier/base/xmpp_client_socket_factory.h
@@ -15,9 +15,7 @@ namespace net {
class ClientSocketFactory;
class ClientSocketHandle;
class HostPortPair;
-class NetLog;
class SSLClientSocket;
-class SSLHostInfo;
class StreamSocket;
class URLRequestContextGetter;
}
diff --git a/jingle/notifier/communicator/login.h b/jingle/notifier/communicator/login.h
index c2da86f..ddc506e 100644
--- a/jingle/notifier/communicator/login.h
+++ b/jingle/notifier/communicator/login.h
@@ -19,7 +19,6 @@
namespace buzz {
class XmppClient;
-class XmppEngine;
class XmppClientSettings;
class XmppTaskParentInterface;
} // namespace buzz
diff --git a/jingle/notifier/communicator/login_settings.h b/jingle/notifier/communicator/login_settings.h
index dd8a373..7899cef 100644
--- a/jingle/notifier/communicator/login_settings.h
+++ b/jingle/notifier/communicator/login_settings.h
@@ -15,10 +15,6 @@ namespace buzz {
class XmppClientSettings;
}
-namespace talk_base {
-class SocketAddress;
-}
-
namespace notifier {
class ConnectionOptions;
diff --git a/jingle/notifier/communicator/xmpp_connection_generator.h b/jingle/notifier/communicator/xmpp_connection_generator.h
index 34f5ace..1100575 100644
--- a/jingle/notifier/communicator/xmpp_connection_generator.h
+++ b/jingle/notifier/communicator/xmpp_connection_generator.h
@@ -15,11 +15,6 @@
#include "net/base/single_request_host_resolver.h"
#include "jingle/notifier/base/server_information.h"
-namespace talk_base {
-struct ProxyInfo;
-class SignalThread;
-}
-
namespace notifier {
class ConnectionOptions;
diff --git a/media/audio/mac/audio_manager_mac.h b/media/audio/mac/audio_manager_mac.h
index b7c29bc..59d2fd8 100644
--- a/media/audio/mac/audio_manager_mac.h
+++ b/media/audio/mac/audio_manager_mac.h
@@ -9,9 +9,6 @@
#include "base/compiler_specific.h"
#include "media/audio/audio_manager_base.h"
-class PCMQueueInAudioInputStream;
-class PCMQueueOutAudioOutputStream;
-
// Mac OS X implementation of the AudioManager singleton. This class is internal
// to the audio output and only internal users can call methods not exposed by
// the AudioManager class.
diff --git a/media/audio/win/audio_manager_win.h b/media/audio/win/audio_manager_win.h
index 949e765..3412527 100644
--- a/media/audio/win/audio_manager_win.h
+++ b/media/audio/win/audio_manager_win.h
@@ -11,7 +11,6 @@
#include "base/compiler_specific.h"
#include "media/audio/audio_manager_base.h"
-class PCMWaveInAudioInputStream;
class PCMWaveOutAudioOutputStream;
// Windows implementation of the AudioManager singleton. This class is internal
diff --git a/media/base/demuxer_stream.h b/media/base/demuxer_stream.h
index 9ba4960..8763d8d 100644
--- a/media/base/demuxer_stream.h
+++ b/media/base/demuxer_stream.h
@@ -9,8 +9,6 @@
#include "base/memory/ref_counted.h"
#include "media/base/media_export.h"
-struct AVStream;
-
namespace media {
class AudioDecoderConfig;
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
index 8bf7705..ddfe51e 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -39,15 +39,13 @@
struct AVFormatContext;
struct AVPacket;
struct AVRational;
+struct AVStream;
namespace media {
class BitstreamConverter;
class FFmpegDemuxer;
-// Forward declaration for scoped_ptr_malloc.
-class ScopedPtrAVFree;
-
class FFmpegDemuxerStream : public DemuxerStream {
public:
// Keeps a copy of |demuxer| and initializes itself using information