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 /ipc | |
| 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 'ipc')
| -rw-r--r-- | ipc/ipc_channel.h | 4 | ||||
| -rw-r--r-- | ipc/ipc_channel_win.cc | 1 | ||||
| -rw-r--r-- | ipc/ipc_send_fds_test.cc | 3 | ||||
| -rw-r--r-- | ipc/ipc_test_sink.cc | 1 |
4 files changed, 4 insertions, 5 deletions
diff --git a/ipc/ipc_channel.h b/ipc/ipc_channel.h index 500dcf7..e86fc35 100644 --- a/ipc/ipc_channel.h +++ b/ipc/ipc_channel.h @@ -17,10 +17,6 @@ #include "ipc/ipc_message.h" #include "ipc/ipc_sender.h" -// TODO(brettw) remove this and update files that depend on this being included -// from here. -#include "ipc/ipc_listener.h" - namespace IPC { class Listener; diff --git a/ipc/ipc_channel_win.cc b/ipc/ipc_channel_win.cc index 3cc1c6e..6fb4416 100644 --- a/ipc/ipc_channel_win.cc +++ b/ipc/ipc_channel_win.cc @@ -16,6 +16,7 @@ #include "base/threading/thread_checker.h" #include "base/utf_string_conversions.h" #include "base/win/scoped_handle.h" +#include "ipc/ipc_listener.h" #include "ipc/ipc_logging.h" #include "ipc/ipc_message_utils.h" diff --git a/ipc/ipc_send_fds_test.cc b/ipc/ipc_send_fds_test.cc index eeee56b..6679088 100644 --- a/ipc/ipc_send_fds_test.cc +++ b/ipc/ipc_send_fds_test.cc @@ -17,6 +17,7 @@ extern "C" { #include "base/message_loop.h" #include "base/posix/eintr_wrapper.h" #include "ipc/ipc_channel.h" +#include "ipc/ipc_listener.h" #include "ipc/ipc_message_utils.h" #include "ipc/ipc_multiprocess_test.h" #include "testing/multiprocess_func_list.h" @@ -81,7 +82,7 @@ class MyChannelDescriptorListener : public IPC::Listener { unsigned num_fds_received_; }; -void TestDescriptorServer(IPC::Channel &chan, +void TestDescriptorServer(IPC::Channel& chan, base::ProcessHandle process_handle) { ASSERT_TRUE(process_handle); diff --git a/ipc/ipc_test_sink.cc b/ipc/ipc_test_sink.cc index 2dc8898..070fe12 100644 --- a/ipc/ipc_test_sink.cc +++ b/ipc/ipc_test_sink.cc @@ -4,6 +4,7 @@ #include "ipc/ipc_test_sink.h" +#include "ipc/ipc_listener.h" #include "ipc/ipc_message.h" namespace IPC { |