summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-04 09:03:43 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-04 09:03:43 +0000
commit1e82fb0bd40ad9bbb9ade89e000158ef3808542b (patch)
tree8bed637c3fb2654d1487244fa137e1ac21863234 /chrome/common
parent7d5c3acd124fae8816416374f629752138ec08e1 (diff)
downloadchromium_src-1e82fb0bd40ad9bbb9ade89e000158ef3808542b.zip
chromium_src-1e82fb0bd40ad9bbb9ade89e000158ef3808542b.tar.gz
chromium_src-1e82fb0bd40ad9bbb9ade89e000158ef3808542b.tar.bz2
Check in the files that were deleted but not readded in my revert (forgot to do so after doing the reverse patch).
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9133 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/ipc_sync_channel_unittest.h19
-rw-r--r--chrome/common/plugin_messages.cc23
-rw-r--r--chrome/common/render_messages.cc22
3 files changed, 64 insertions, 0 deletions
diff --git a/chrome/common/ipc_sync_channel_unittest.h b/chrome/common/ipc_sync_channel_unittest.h
new file mode 100644
index 0000000..c4d2354
--- /dev/null
+++ b/chrome/common/ipc_sync_channel_unittest.h
@@ -0,0 +1,19 @@
+// Copyright (c) 2006-2008 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.
+
+#include "chrome/common/ipc_message_macros.h"
+
+// Messages used for IPC::SyncChannel unit test
+IPC_BEGIN_MESSAGES(SyncChannelTest, 9)
+ IPC_SYNC_MESSAGE_CONTROL0_0(SyncChannelTestMsg_NoArgs)
+
+ IPC_SYNC_MESSAGE_CONTROL0_1(SyncChannelTestMsg_AnswerToLife,
+ int /* answer */)
+
+ IPC_SYNC_MESSAGE_CONTROL1_1(SyncChannelTestMsg_Double,
+ int /* in */,
+ int /* out */)
+
+IPC_END_MESSAGES(SyncChannelTest)
+
diff --git a/chrome/common/plugin_messages.cc b/chrome/common/plugin_messages.cc
new file mode 100644
index 0000000..cd5b00a
--- /dev/null
+++ b/chrome/common/plugin_messages.cc
@@ -0,0 +1,23 @@
+// Copyright (c) 2006-2008 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.
+
+#include "chrome/common/ipc_message.h"
+
+#ifdef IPC_MESSAGE_LOG_ENABLED
+
+#define IPC_MESSAGE_MACROS_LOG_ENABLED
+
+#endif // IPC_MESSAGE_LOG_ENABLED
+
+#include "chrome/common/plugin_messages.h"
+
+void PluginMessagesInit() {
+#ifdef IPC_MESSAGE_LOG_ENABLED
+ IPC::RegisterMessageLogger(PluginProcessStart, PluginProcessMsgLog);
+ IPC::RegisterMessageLogger(PluginProcessHostStart, PluginProcessHostMsgLog);
+ IPC::RegisterMessageLogger(PluginStart, PluginMsgLog);
+ IPC::RegisterMessageLogger(PluginHostStart, PluginHostMsgLog);
+ IPC::RegisterMessageLogger(NPObjectStart, NPObjectMsgLog);
+#endif
+}
diff --git a/chrome/common/render_messages.cc b/chrome/common/render_messages.cc
new file mode 100644
index 0000000..55f21552
--- /dev/null
+++ b/chrome/common/render_messages.cc
@@ -0,0 +1,22 @@
+// Copyright (c) 2006-2008 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.
+
+#include "chrome/common/ipc_message.h"
+
+#ifdef IPC_MESSAGE_LOG_ENABLED
+
+// Preprocessor magic: render_messages.h defines the enums and debug string
+// functions if this define is set.
+#define IPC_MESSAGE_MACROS_LOG_ENABLED
+
+#endif // IPC_MESSAGE_LOG_ENABLED
+
+#include "chrome/common/render_messages.h"
+
+void RenderMessagesInit() {
+#ifdef IPC_MESSAGE_LOG_ENABLED
+ IPC::RegisterMessageLogger(ViewStart, ViewMsgLog);
+ IPC::RegisterMessageLogger(ViewHostStart, ViewHostMsgLog);
+#endif
+}