summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-22 23:57:21 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-22 23:57:21 +0000
commit946d1b2c806795351598aeb9faaed797284a8ee3 (patch)
treed8d2695f73a56ec33ab068f9070fe93cb7c0e4a3 /chrome/renderer
parent00fceac62015db950f3dde84f5aeeacb82f1b2c6 (diff)
downloadchromium_src-946d1b2c806795351598aeb9faaed797284a8ee3.zip
chromium_src-946d1b2c806795351598aeb9faaed797284a8ee3.tar.gz
chromium_src-946d1b2c806795351598aeb9faaed797284a8ee3.tar.bz2
Split the IPC code into ipc/
This splits the ipc code from the common project. The 'common' project pulls in all of webkit, the v8 bindings, skia, googleurl, and a number of other projects which makes it very difficult to deal with especially for external projects wanting just to use some of Chromium's infrastructure. This puts the ipc code into its top-level ipc/ directory with a dependency only on base. The common project depends on the new ipc/ipc.gyp:ipc target so that all projects currently pulling common in to get the IPC code still have it available. This mostly follows agl's pre-gyp attempt to do this which was r13062. Known issues: - Currently a number of projects depend on chrome/chrome.gyp:common in order to use the IPC infrastructure. Rather than fixing all of these dependencies I have made common depend on ipc/ipc.gyp:ipc and added "ipc" to the include_rules section of DEPS so that checkdeps.py doesn't complain. Over time projects that need IPC should depend on the IPC project themselves and dependencies on common removed, although I don't think many projects that need IPC will be able to get away without common currently. - ipc/ipc_message_macros.h still has #include "chrome/common/..." inside of a ipc/ should not refer to files in chrome/... now. I'm not sure how to resolve this since it's really an IDE bug - the named pipe name (windows+linux) and the logging event name (all) + env variable (posix) refer explicitly to 'Chrome' which somewhat hurts the illusion of ipc/ being an independent library. I think this should be examined in a subsequent, much smaller patch. - I've eliminated the IPC.SendMsgCount counter since it was implemented in a way to create a dependency from ipc/ to chrome/common/chrome_counters. This is the same approach that r13062 took. http://codereview.chromium.org/155905 (Patch from James Robinson) git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/audio_message_filter.cc2
-rw-r--r--chrome/renderer/audio_message_filter.h2
-rw-r--r--chrome/renderer/automation/dom_automation_controller.h2
-rw-r--r--chrome/renderer/devtools_agent_filter.h2
-rw-r--r--chrome/renderer/dom_ui_bindings.h2
-rw-r--r--chrome/renderer/external_host_bindings.h2
-rw-r--r--chrome/renderer/mock_printer.cc2
-rw-r--r--chrome/renderer/mock_render_thread.cc2
-rw-r--r--chrome/renderer/plugin_channel_host.cc2
-rw-r--r--chrome/renderer/render_process.cc4
-rw-r--r--chrome/renderer/render_thread_unittest.cc2
-rw-r--r--chrome/renderer/render_widget.h2
-rw-r--r--chrome/renderer/renderer_main_unittest.cc2
-rw-r--r--chrome/renderer/webplugin_delegate_proxy.cc2
-rw-r--r--chrome/renderer/webplugin_delegate_proxy.h2
-rw-r--r--chrome/renderer/webworker_proxy.h2
16 files changed, 17 insertions, 17 deletions
diff --git a/chrome/renderer/audio_message_filter.cc b/chrome/renderer/audio_message_filter.cc
index 0714b71..b875f92 100644
--- a/chrome/renderer/audio_message_filter.cc
+++ b/chrome/renderer/audio_message_filter.cc
@@ -4,9 +4,9 @@
#include "base/histogram.h"
#include "base/message_loop.h"
-#include "chrome/common/ipc_logging.h"
#include "chrome/common/render_messages.h"
#include "chrome/renderer/audio_message_filter.h"
+#include "ipc/ipc_logging.h"
namespace {
diff --git a/chrome/renderer/audio_message_filter.h b/chrome/renderer/audio_message_filter.h
index 7626b3c..7fa17cb 100644
--- a/chrome/renderer/audio_message_filter.h
+++ b/chrome/renderer/audio_message_filter.h
@@ -12,7 +12,7 @@
#include "base/id_map.h"
#include "base/shared_memory.h"
-#include "chrome/common/ipc_channel_proxy.h"
+#include "ipc/ipc_channel_proxy.h"
#include "media/audio/audio_output.h"
#include "testing/gtest/include/gtest/gtest_prod.h"
diff --git a/chrome/renderer/automation/dom_automation_controller.h b/chrome/renderer/automation/dom_automation_controller.h
index 94720f7..bc6f5fe 100644
--- a/chrome/renderer/automation/dom_automation_controller.h
+++ b/chrome/renderer/automation/dom_automation_controller.h
@@ -5,7 +5,7 @@
#ifndef CHROME_RENDERER_AUTOMATION_DOM_AUTOMATION_CONTROLLER_H__
#define CHROME_RENDERER_AUTOMATION_DOM_AUTOMATION_CONTROLLER_H__
-#include "chrome/common/ipc_message.h"
+#include "ipc/ipc_message.h"
#include "webkit/glue/cpp_bound_class.h"
/* DomAutomationController class:
diff --git a/chrome/renderer/devtools_agent_filter.h b/chrome/renderer/devtools_agent_filter.h
index 91872e4..c04a44a4 100644
--- a/chrome/renderer/devtools_agent_filter.h
+++ b/chrome/renderer/devtools_agent_filter.h
@@ -8,7 +8,7 @@
#include <set>
#include <string>
-#include "chrome/common/ipc_channel_proxy.h"
+#include "ipc/ipc_channel_proxy.h"
class WebDevToolsAgent;
diff --git a/chrome/renderer/dom_ui_bindings.h b/chrome/renderer/dom_ui_bindings.h
index 23b2d35..b4ad992 100644
--- a/chrome/renderer/dom_ui_bindings.h
+++ b/chrome/renderer/dom_ui_bindings.h
@@ -5,7 +5,7 @@
#ifndef CHROME_RENDERER_DOM_UI_BINDINGS_H__
#define CHROME_RENDERER_DOM_UI_BINDINGS_H__
-#include "chrome/common/ipc_message.h"
+#include "ipc/ipc_message.h"
#include "webkit/glue/cpp_bound_class.h"
// A DOMBoundBrowserObject is a backing for some object bound to the window
diff --git a/chrome/renderer/external_host_bindings.h b/chrome/renderer/external_host_bindings.h
index cd8bcdb..d995975 100644
--- a/chrome/renderer/external_host_bindings.h
+++ b/chrome/renderer/external_host_bindings.h
@@ -5,8 +5,8 @@
#ifndef CHROME_RENDERER_EXTERNAL_HOST_BINDINGS_H_
#define CHROME_RENDERER_EXTERNAL_HOST_BINDINGS_H_
-#include "chrome/common/ipc_message.h"
#include "chrome/renderer/dom_ui_bindings.h"
+#include "ipc/ipc_message.h"
// ExternalHostBindings is the class backing the "externalHost" object
// accessible from Javascript
diff --git a/chrome/renderer/mock_printer.cc b/chrome/renderer/mock_printer.cc
index 4462ce7..2da66ae 100644
--- a/chrome/renderer/mock_printer.cc
+++ b/chrome/renderer/mock_printer.cc
@@ -7,8 +7,8 @@
#include "base/file_util.h"
#include "base/logging.h"
#include "base/shared_memory.h"
-#include "chrome/common/ipc_message_utils.h"
#include "chrome/common/render_messages.h"
+#include "ipc/ipc_message_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
MockPrinter::MockPrinter()
diff --git a/chrome/renderer/mock_render_thread.cc b/chrome/renderer/mock_render_thread.cc
index 17dab52..e99c618 100644
--- a/chrome/renderer/mock_render_thread.cc
+++ b/chrome/renderer/mock_render_thread.cc
@@ -4,8 +4,8 @@
#include "chrome/renderer/mock_render_thread.h"
-#include "chrome/common/ipc_message_utils.h"
#include "chrome/common/render_messages.h"
+#include "ipc/ipc_message_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
MockRenderThread::MockRenderThread()
diff --git a/chrome/renderer/plugin_channel_host.cc b/chrome/renderer/plugin_channel_host.cc
index 0befaab..04d7b4f 100644
--- a/chrome/renderer/plugin_channel_host.cc
+++ b/chrome/renderer/plugin_channel_host.cc
@@ -7,7 +7,7 @@
#include "chrome/common/plugin_messages.h"
#if defined(OS_POSIX)
-#include "chrome/common/ipc_channel_posix.h"
+#include "ipc/ipc_channel_posix.h"
#endif
// A simple MessageFilter that will ignore all messages and respond to sync
diff --git a/chrome/renderer/render_process.cc b/chrome/renderer/render_process.cc
index fd06081..1b8509f 100644
--- a/chrome/renderer/render_process.cc
+++ b/chrome/renderer/render_process.cc
@@ -24,11 +24,11 @@
#include "chrome/browser/net/dns_global.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_paths.h"
-#include "chrome/common/ipc_channel.h"
-#include "chrome/common/ipc_message_utils.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/transport_dib.h"
#include "chrome/renderer/render_view.h"
+#include "ipc/ipc_channel.h"
+#include "ipc/ipc_message_utils.h"
#include "media/base/media.h"
#include "webkit/glue/webkit_glue.h"
diff --git a/chrome/renderer/render_thread_unittest.cc b/chrome/renderer/render_thread_unittest.cc
index bb2e297..76491fe 100644
--- a/chrome/renderer/render_thread_unittest.cc
+++ b/chrome/renderer/render_thread_unittest.cc
@@ -3,10 +3,10 @@
// found in the LICENSE file.
#include "base/waitable_event.h"
-#include "chrome/common/ipc_sync_channel.h"
#include "chrome/common/render_messages.h"
#include "chrome/renderer/mock_render_process.h"
#include "chrome/renderer/render_thread.h"
+#include "ipc/ipc_sync_channel.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h
index 005b4b6..7c6e592 100644
--- a/chrome/renderer/render_widget.h
+++ b/chrome/renderer/render_widget.h
@@ -13,8 +13,8 @@
#include "base/gfx/size.h"
#include "base/ref_counted.h"
#include "base/shared_memory.h"
-#include "chrome/common/ipc_channel.h"
#include "chrome/renderer/render_process.h"
+#include "ipc/ipc_channel.h"
#include "skia/ext/platform_canvas.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "webkit/api/public/WebCompositionCommand.h"
diff --git a/chrome/renderer/renderer_main_unittest.cc b/chrome/renderer/renderer_main_unittest.cc
index 605101e..598277a 100644
--- a/chrome/renderer/renderer_main_unittest.cc
+++ b/chrome/renderer/renderer_main_unittest.cc
@@ -6,8 +6,8 @@
#include "base/multiprocess_test.h"
#include "base/process_util.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/ipc_channel.h"
#include "chrome/common/main_function_params.h"
+#include "ipc/ipc_channel.h"
#include "testing/gtest/include/gtest/gtest.h"
// TODO(port): Bring up this test this on other platforms.
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index 524b908..34a728d 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -41,7 +41,7 @@
#include "webkit/glue/webview.h"
#if defined(OS_POSIX)
-#include "chrome/common/ipc_channel_posix.h"
+#include "ipc/ipc_channel_posix.h"
#endif
#if defined(OS_MACOSX)
diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h
index a772384..17ce1d1 100644
--- a/chrome/renderer/webplugin_delegate_proxy.h
+++ b/chrome/renderer/webplugin_delegate_proxy.h
@@ -12,10 +12,10 @@
#include "base/gfx/rect.h"
#include "base/gfx/native_widget_types.h"
#include "base/ref_counted.h"
-#include "chrome/common/ipc_message.h"
#include "chrome/common/transport_dib.h"
#include "chrome/renderer/plugin_channel_host.h"
#include "googleurl/src/gurl.h"
+#include "ipc/ipc_message.h"
#include "skia/ext/platform_canvas.h"
#include "webkit/glue/webplugin.h"
#include "webkit/glue/webplugin_delegate.h"
diff --git a/chrome/renderer/webworker_proxy.h b/chrome/renderer/webworker_proxy.h
index b56cf8e..7567060 100644
--- a/chrome/renderer/webworker_proxy.h
+++ b/chrome/renderer/webworker_proxy.h
@@ -8,7 +8,7 @@
#include <vector>
#include "base/basictypes.h"
-#include "chrome/common/ipc_channel.h"
+#include "ipc/ipc_channel.h"
#include "webkit/api/public/WebWorker.h"
class ChildThread;