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

Unified Diff: chrome/service/service_ipc_server.cc

Issue 1184523003: attachment broker wip (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor comments. Created 5 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/service/service_ipc_server.h ('k') | chrome/utility/importer/firefox_importer_unittest_utils_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/service/service_ipc_server.cc
diff --git a/chrome/service/service_ipc_server.cc b/chrome/service/service_ipc_server.cc
index 45582425cc19badcbf0ac12f63fb4a79b42be148..419c46c00d17d908a5bab7fec99825f7b77eeb50 100644
--- a/chrome/service/service_ipc_server.cc
+++ b/chrome/service/service_ipc_server.cc
@@ -8,8 +8,13 @@
#include "chrome/common/service_messages.h"
#include "chrome/service/cloud_print/cloud_print_proxy.h"
#include "chrome/service/service_process.h"
+#include "ipc/attachment_broker.h"
#include "ipc/ipc_logging.h"
+#if defined(OS_WIN)
+#include "ipc/attachment_broker_win.h"
+#endif
+
ServiceIPCServer::ServiceIPCServer(const IPC::ChannelHandle& channel_handle)
: channel_handle_(channel_handle), client_connected_(false) {
}
@@ -20,6 +25,9 @@ bool ServiceIPCServer::Init() {
#endif
sync_message_filter_ =
new IPC::SyncMessageFilter(g_service_process->shutdown_event());
+#if defined(OS_WIN)
+ attachment_broker_.reset(new IPC::AttachmentBrokerWin());
+#endif
CreateChannel();
return true;
}
@@ -29,7 +37,7 @@ void ServiceIPCServer::CreateChannel() {
channel_ = IPC::SyncChannel::Create(
channel_handle_, IPC::Channel::MODE_NAMED_SERVER, this,
g_service_process->io_thread()->task_runner().get(), true,
- g_service_process->shutdown_event());
+ g_service_process->shutdown_event(), attachment_broker_.get());
DCHECK(sync_message_filter_.get());
channel_->AddFilter(sync_message_filter_.get());
}
« no previous file with comments | « chrome/service/service_ipc_server.h ('k') | chrome/utility/importer/firefox_importer_unittest_utils_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698