diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-17 19:20:05 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-17 19:20:05 +0000 |
| commit | 0ee99068710e21b601bff9f3268553fdd675bc7d (patch) | |
| tree | 63f88f29c5ae7dc248b46339557016e88b3f4634 /chrome | |
| parent | 93aefedd1e66d67a6e5e97ed7916e8f2942e8896 (diff) | |
| download | chromium_src-0ee99068710e21b601bff9f3268553fdd675bc7d.zip chromium_src-0ee99068710e21b601bff9f3268553fdd675bc7d.tar.gz chromium_src-0ee99068710e21b601bff9f3268553fdd675bc7d.tar.bz2 | |
ipc: Remove ipc_listener.h from ipc_channel.h and update the files.
Note: This was a TODO for brett in ipc_channel.h
TBR=cpu@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11308082
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168458 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/importer/firefox_importer_unittest_utils_mac.cc | 1 | ||||
| -rw-r--r-- | chrome/nacl/nacl_broker_listener.cc | 1 | ||||
| -rw-r--r-- | chrome/nacl/nacl_broker_listener.h | 6 | ||||
| -rw-r--r-- | chrome/nacl/nacl_ipc_adapter.cc | 1 | ||||
| -rw-r--r-- | chrome/nacl/nacl_ipc_adapter.h | 7 |
5 files changed, 12 insertions, 4 deletions
diff --git a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc index cee97c3..077571a 100644 --- a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc +++ b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc @@ -14,6 +14,7 @@ #include "chrome/browser/importer/firefox_importer_utils.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_descriptors.h" +#include "ipc/ipc_listener.h" #include "ipc/ipc_message.h" #include "ipc/ipc_multiprocess_test.h" #include "ipc/ipc_switches.h" diff --git a/chrome/nacl/nacl_broker_listener.cc b/chrome/nacl/nacl_broker_listener.cc index 1bb42d6b..135997c 100644 --- a/chrome/nacl/nacl_broker_listener.cc +++ b/chrome/nacl/nacl_broker_listener.cc @@ -16,6 +16,7 @@ #include "chrome/common/nacl_messages.h" #include "content/public/common/content_switches.h" #include "content/public/common/sandbox_init.h" +#include "ipc/ipc_channel.h" #include "ipc/ipc_switches.h" namespace { diff --git a/chrome/nacl/nacl_broker_listener.h b/chrome/nacl/nacl_broker_listener.h index 56f50be..6ebc179 100644 --- a/chrome/nacl/nacl_broker_listener.h +++ b/chrome/nacl/nacl_broker_listener.h @@ -8,7 +8,11 @@ #include "base/memory/scoped_ptr.h" #include "base/process.h" #include "chrome/common/nacl_types.h" -#include "ipc/ipc_channel.h" +#include "ipc/ipc_listener.h" + +namespace IPC { +class Channel; +} // The BrokerThread class represents the thread that handles the messages from // the browser process and starts NaCl loader processes. diff --git a/chrome/nacl/nacl_ipc_adapter.cc b/chrome/nacl/nacl_ipc_adapter.cc index 1ee0c37..2bbaa1f 100644 --- a/chrome/nacl/nacl_ipc_adapter.cc +++ b/chrome/nacl/nacl_ipc_adapter.cc @@ -13,6 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/shared_memory.h" #include "build/build_config.h" +#include "ipc/ipc_channel.h" #include "ipc/ipc_message_macros.h" #include "ipc/ipc_platform_file.h" #include "native_client/src/trusted/desc/nacl_desc_custom.h" diff --git a/chrome/nacl/nacl_ipc_adapter.h b/chrome/nacl/nacl_ipc_adapter.h index 3752139..f9db3dc 100644 --- a/chrome/nacl/nacl_ipc_adapter.h +++ b/chrome/nacl/nacl_ipc_adapter.h @@ -13,19 +13,20 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" +#include "base/pickle.h" #include "base/shared_memory.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" #include "base/task_runner.h" -#include "ipc/ipc_channel.h" -#include "ipc/ipc_message.h" +#include "ipc/ipc_listener.h" struct NaClDesc; struct NaClImcTypedMsgHdr; struct PP_Size; namespace IPC { -class Message; +class Channel; +struct ChannelHandle; } namespace nacl { |