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

Unified Diff: ipc/ipc_sync_channel.h

Issue 1279863004: Complete SyncMessageFilter initialization after SyncChannel initialization (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: eh, vector instead of list Created 5 years, 4 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 | « ipc/ipc_channel_proxy.cc ('k') | ipc/ipc_sync_channel.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/ipc_sync_channel.h
diff --git a/ipc/ipc_sync_channel.h b/ipc/ipc_sync_channel.h
index 2fd1b117efca76a75db3a773e35d32e0ba9de533..243d6b07cfe972376d8c7b3c7d7c977227c13a50 100644
--- a/ipc/ipc_sync_channel.h
+++ b/ipc/ipc_sync_channel.h
@@ -5,8 +5,9 @@
#ifndef IPC_IPC_SYNC_CHANNEL_H_
#define IPC_IPC_SYNC_CHANNEL_H_
-#include <string>
#include <deque>
+#include <string>
+#include <vector>
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
@@ -233,10 +234,16 @@ class IPC_EXPORT SyncChannel : public ChannelProxy {
// Starts the dispatch watcher.
void StartWatching();
+ // ChannelProxy overrides:
+ void OnChannelInit() override;
+
// Used to signal events between the IPC and listener threads.
base::WaitableEventWatcher dispatch_watcher_;
base::WaitableEventWatcher::EventCallback dispatch_watcher_callback_;
+ // Tracks SyncMessageFilters created before complete channel initialization.
+ std::vector<scoped_refptr<SyncMessageFilter>> pre_init_sync_message_filters_;
+
DISALLOW_COPY_AND_ASSIGN(SyncChannel);
};
« no previous file with comments | « ipc/ipc_channel_proxy.cc ('k') | ipc/ipc_sync_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698