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

Side by Side Diff: mojo/edk/embedder/channel_init.cc

Issue 782693004: Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: hack mojo_system_impl gypi for android :| Created 6 years 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
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 "mojo/edk/embedder/channel_init.h" 5 #include "mojo/edk/embedder/channel_init.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "mojo/edk/embedder/embedder.h" 9 #include "mojo/edk/embedder/embedder.h"
10 10
11 namespace mojo { 11 namespace mojo {
12 namespace embedder { 12 namespace embedder {
13 13
14 ChannelInit::ChannelInit() : channel_info_(nullptr), weak_factory_(this) { 14 ChannelInit::ChannelInit() : channel_info_(nullptr), weak_factory_(this) {
15 } 15 }
16 16
17 ChannelInit::~ChannelInit() { 17 ChannelInit::~ChannelInit() {
18 if (channel_info_) 18 if (channel_info_)
19 DestroyChannel(channel_info_); 19 DestroyChannel(channel_info_);
20 } 20 }
21 21
22 ScopedMessagePipeHandle ChannelInit::Init( 22 ScopedMessagePipeHandle ChannelInit::Init(
23 base::PlatformFile file, 23 base::PlatformFile file,
24 scoped_refptr<base::TaskRunner> io_thread_task_runner) { 24 scoped_refptr<base::TaskRunner> io_thread_task_runner) {
25 DCHECK(!io_thread_task_runner_.get()); // Should only init once. 25 DCHECK(!io_thread_task_runner_); // Should only init once.
26 io_thread_task_runner_ = io_thread_task_runner; 26 io_thread_task_runner_ = io_thread_task_runner;
27 ScopedMessagePipeHandle message_pipe = 27 ScopedMessagePipeHandle message_pipe =
28 CreateChannel( 28 CreateChannel(
29 ScopedPlatformHandle(PlatformHandle(file)), io_thread_task_runner, 29 ScopedPlatformHandle(PlatformHandle(file)), io_thread_task_runner,
30 base::Bind(&ChannelInit::OnCreatedChannel, weak_factory_.GetWeakPtr(), 30 base::Bind(&ChannelInit::OnCreatedChannel, weak_factory_.GetWeakPtr(),
31 io_thread_task_runner), 31 io_thread_task_runner),
32 base::MessageLoop::current()->message_loop_proxy()).Pass(); 32 base::MessageLoop::current()->message_loop_proxy()).Pass();
33 return message_pipe.Pass(); 33 return message_pipe.Pass();
34 } 34 }
35 35
(...skipping 10 matching lines...) Expand all
46 if (!self) { 46 if (!self) {
47 DestroyChannel(channel); 47 DestroyChannel(channel);
48 return; 48 return;
49 } 49 }
50 50
51 self->channel_info_ = channel; 51 self->channel_info_ = channel;
52 } 52 }
53 53
54 } // namespace embedder 54 } // namespace embedder
55 } // namespace mojo 55 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698