diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-03 02:29:45 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-03 02:29:45 +0000 |
| commit | 82e5ee816a5f05d230c5356205e93d803650d0b9 (patch) | |
| tree | 6b6e9d1bef407feef8ef24eedc9f343e2d536609 /chrome/plugin | |
| parent | 8cf3f1dae79db8cfbf9dc6b75c140eabad918a6e (diff) | |
| download | chromium_src-82e5ee816a5f05d230c5356205e93d803650d0b9.zip chromium_src-82e5ee816a5f05d230c5356205e93d803650d0b9.tar.gz chromium_src-82e5ee816a5f05d230c5356205e93d803650d0b9.tar.bz2 | |
Revert "Move IPC code to ipc/"
This reverts commit r13062 which, unsurprisingly, broke the build.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13063 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
| -rw-r--r-- | chrome/plugin/npobject_proxy.h | 2 | ||||
| -rw-r--r-- | chrome/plugin/npobject_stub.h | 2 | ||||
| -rw-r--r-- | chrome/plugin/plugin_channel_base.cc | 2 | ||||
| -rw-r--r-- | chrome/plugin/plugin_channel_base.h | 2 | ||||
| -rw-r--r-- | chrome/plugin/webplugin_delegate_stub.h | 2 | ||||
| -rw-r--r-- | chrome/plugin/webplugin_proxy.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/chrome/plugin/npobject_proxy.h b/chrome/plugin/npobject_proxy.h index 14892f8a..bb0ec2c 100644 --- a/chrome/plugin/npobject_proxy.h +++ b/chrome/plugin/npobject_proxy.h @@ -9,7 +9,7 @@ #define CHROME_PLUGIN_NPOBJECT_PROXY_H_ #include "base/ref_counted.h" -#include "ipc/ipc_channel.h" +#include "chrome/common/ipc_channel.h" #include "third_party/npapi/bindings/npruntime.h" class PluginChannelBase; diff --git a/chrome/plugin/npobject_stub.h b/chrome/plugin/npobject_stub.h index 98be7da..cd75853 100644 --- a/chrome/plugin/npobject_stub.h +++ b/chrome/plugin/npobject_stub.h @@ -11,7 +11,7 @@ #include <vector> #include "base/ref_counted.h" -#include "ipc/ipc_channel.h" +#include "chrome/common/ipc_channel.h" namespace base { class WaitableEvent; diff --git a/chrome/plugin/plugin_channel_base.cc b/chrome/plugin/plugin_channel_base.cc index 066610a..0e26e86 100644 --- a/chrome/plugin/plugin_channel_base.cc +++ b/chrome/plugin/plugin_channel_base.cc @@ -8,7 +8,7 @@ #include "base/hash_tables.h" #include "chrome/common/child_process.h" -#include "ipc/ipc_sync_message.h" +#include "chrome/common/ipc_sync_message.h" typedef base::hash_map<std::wstring, scoped_refptr<PluginChannelBase> > PluginChannelMap; diff --git a/chrome/plugin/plugin_channel_base.h b/chrome/plugin/plugin_channel_base.h index e36db71..dd70cba 100644 --- a/chrome/plugin/plugin_channel_base.h +++ b/chrome/plugin/plugin_channel_base.h @@ -12,7 +12,7 @@ #include "base/message_loop.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "ipc/ipc_sync_channel.h" +#include "chrome/common/ipc_sync_channel.h" #include "chrome/common/message_router.h" // Encapsulates an IPC channel between a renderer and a plugin process. diff --git a/chrome/plugin/webplugin_delegate_stub.h b/chrome/plugin/webplugin_delegate_stub.h index b121b14..995d318 100644 --- a/chrome/plugin/webplugin_delegate_stub.h +++ b/chrome/plugin/webplugin_delegate_stub.h @@ -11,7 +11,7 @@ #include "base/ref_counted.h" #include "base/shared_memory.h" #include "base/task.h" -#include "ipc/ipc_channel.h" +#include "chrome/common/ipc_channel.h" #include "third_party/npapi/bindings/npapi.h" class GURL; diff --git a/chrome/plugin/webplugin_proxy.h b/chrome/plugin/webplugin_proxy.h index 1d5f72e..8c4629d 100644 --- a/chrome/plugin/webplugin_proxy.h +++ b/chrome/plugin/webplugin_proxy.h @@ -11,8 +11,8 @@ #include "base/scoped_ptr.h" #include "base/shared_memory.h" #include "base/timer.h" +#include "chrome/common/ipc_message.h" #include "chrome/common/chrome_plugin_api.h" -#include "ipc/ipc_message.h" #include "webkit/glue/webplugin.h" namespace base { |