Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(154)

Unified Diff: chrome/renderer/media/cast_ipc_dispatcher.cc

Issue 343593006: Revert 276939 "Decouple IPC::MessageFilter from IPC::Channel" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2057/src/
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/media/cast_ipc_dispatcher.h ('k') | chrome/renderer/media/webrtc_logging_message_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/media/cast_ipc_dispatcher.cc
===================================================================
--- chrome/renderer/media/cast_ipc_dispatcher.cc (revision 278168)
+++ chrome/renderer/media/cast_ipc_dispatcher.cc (working copy)
@@ -12,7 +12,7 @@
CastIPCDispatcher::CastIPCDispatcher(
const scoped_refptr<base::MessageLoopProxy>& io_message_loop)
- : sender_(NULL),
+ : channel_(NULL),
io_message_loop_(io_message_loop) {
DCHECK(io_message_loop_);
DCHECK(!global_instance_);
@@ -29,8 +29,8 @@
void CastIPCDispatcher::Send(IPC::Message* message) {
DCHECK(io_message_loop_->BelongsToCurrentThread());
- if (sender_) {
- sender_->Send(message);
+ if (channel_) {
+ channel_->Send(message);
} else {
delete message;
}
@@ -56,18 +56,18 @@
return handled;
}
-void CastIPCDispatcher::OnFilterAdded(IPC::Sender* sender) {
+void CastIPCDispatcher::OnFilterAdded(IPC::Channel* channel) {
DCHECK(io_message_loop_->BelongsToCurrentThread());
DCHECK(!global_instance_);
global_instance_ = this;
- sender_ = sender;
+ channel_ = channel;
}
void CastIPCDispatcher::OnFilterRemoved() {
DCHECK(io_message_loop_->BelongsToCurrentThread());
DCHECK_EQ(this, global_instance_);
global_instance_ = NULL;
- sender_ = NULL;
+ channel_ = NULL;
}
void CastIPCDispatcher::OnChannelClosing() {
« no previous file with comments | « chrome/renderer/media/cast_ipc_dispatcher.h ('k') | chrome/renderer/media/webrtc_logging_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698