diff options
| author | jamesr <jamesr@chromium.org> | 2014-11-18 17:35:28 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-19 01:35:49 +0000 |
| commit | a9125266d3fc89ff0bfd4c3a05bf2f31ffaeff1f (patch) | |
| tree | 954602a17f1bfd7fd9d10c255360f75a6ada0d28 /ipc | |
| parent | 558999147d4fdfd1ae7ee79cfa1c6599eab47d57 (diff) | |
| download | chromium_src-a9125266d3fc89ff0bfd4c3a05bf2f31ffaeff1f.zip chromium_src-a9125266d3fc89ff0bfd4c3a05bf2f31ffaeff1f.tar.gz chromium_src-a9125266d3fc89ff0bfd4c3a05bf2f31ffaeff1f.tar.bz2 | |
Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a
Includes updates to ipc/mojo/ipc_channel_mojo.cc for mojo::embedder API
changes and updates to use mojo::Binding<> in ui/keyboard and
device/battery.
Review URL: https://codereview.chromium.org/728133002
Cr-Commit-Position: refs/heads/master@{#304731}
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/mojo/ipc_channel_mojo.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/mojo/ipc_channel_mojo.cc b/ipc/mojo/ipc_channel_mojo.cc index 4051bb5..36e5bae 100644 --- a/ipc/mojo/ipc_channel_mojo.cc +++ b/ipc/mojo/ipc_channel_mojo.cc @@ -168,7 +168,7 @@ void ServerChannelMojo::Close() { void ChannelMojo::ChannelInfoDeleter::operator()( mojo::embedder::ChannelInfo* ptr) const { - mojo::embedder::DestroyChannelOnIOThread(ptr); + mojo::embedder::DestroyChannel(ptr); } //------------------------------------------------------------------------------ |