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

Side by Side Diff: ipc/mojo/ipc_channel_mojo.cc

Issue 728133002: Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android + ios gyp fixes Created 6 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « device/battery/battery_monitor_impl.cc ('k') | media/mojo/services/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ipc/mojo/ipc_channel_mojo.h" 5 #include "ipc/mojo/ipc_channel_mojo.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "ipc/ipc_listener.h" 10 #include "ipc/ipc_listener.h"
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 message_pipe_.reset(); 161 message_pipe_.reset();
162 ChannelMojo::Close(); 162 ChannelMojo::Close();
163 } 163 }
164 164
165 } // namespace 165 } // namespace
166 166
167 //------------------------------------------------------------------------------ 167 //------------------------------------------------------------------------------
168 168
169 void ChannelMojo::ChannelInfoDeleter::operator()( 169 void ChannelMojo::ChannelInfoDeleter::operator()(
170 mojo::embedder::ChannelInfo* ptr) const { 170 mojo::embedder::ChannelInfo* ptr) const {
171 mojo::embedder::DestroyChannelOnIOThread(ptr); 171 mojo::embedder::DestroyChannel(ptr);
172 } 172 }
173 173
174 //------------------------------------------------------------------------------ 174 //------------------------------------------------------------------------------
175 175
176 // static 176 // static
177 bool ChannelMojo::ShouldBeUsed() { 177 bool ChannelMojo::ShouldBeUsed() {
178 // TODO(morrita): Turn this on for a set of platforms. 178 // TODO(morrita): Turn this on for a set of platforms.
179 return false; 179 return false;
180 } 180 }
181 181
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 393
394 fdset->CommitAll(); 394 fdset->CommitAll();
395 } 395 }
396 396
397 return MOJO_RESULT_OK; 397 return MOJO_RESULT_OK;
398 } 398 }
399 399
400 #endif // defined(OS_POSIX) && !defined(OS_NACL) 400 #endif // defined(OS_POSIX) && !defined(OS_NACL)
401 401
402 } // namespace IPC 402 } // namespace IPC
OLDNEW
« no previous file with comments | « device/battery/battery_monitor_impl.cc ('k') | media/mojo/services/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698