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

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

Issue 472903002: Mojo: Get rid of some unneeded namespace qualifiers in mojo/embedder/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « mojo/embedder/channel_init.h ('k') | mojo/embedder/embedder_unittest.cc » ('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 "mojo/embedder/channel_init.h" 5 #include "mojo/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/embedder/embedder.h" 9 #include "mojo/embedder/embedder.h"
10 10
11 namespace mojo { 11 namespace mojo {
12 namespace embedder { 12 namespace embedder {
13 13
14 ChannelInit::ChannelInit() : channel_info_(NULL), weak_factory_(this) { 14 ChannelInit::ChannelInit() : channel_info_(NULL), 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 mojo::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_.get()); // Should only init once.
26 io_thread_task_runner_ = io_thread_task_runner; 26 io_thread_task_runner_ = io_thread_task_runner;
27 mojo::ScopedMessagePipeHandle message_pipe = 27 ScopedMessagePipeHandle message_pipe =
28 mojo::embedder::CreateChannel( 28 CreateChannel(ScopedPlatformHandle(PlatformHandle(file)),
29 mojo::embedder::ScopedPlatformHandle( 29 io_thread_task_runner,
30 mojo::embedder::PlatformHandle(file)), 30 base::Bind(&ChannelInit::OnCreatedChannel,
31 io_thread_task_runner, 31 weak_factory_.GetWeakPtr(),
32 base::Bind(&ChannelInit::OnCreatedChannel, 32 io_thread_task_runner),
33 weak_factory_.GetWeakPtr(), 33 base::MessageLoop::current()->message_loop_proxy()).Pass();
34 io_thread_task_runner),
35 base::MessageLoop::current()->message_loop_proxy()).Pass();
36 return message_pipe.Pass(); 34 return message_pipe.Pass();
37 } 35 }
38 36
39 void ChannelInit::WillDestroySoon() { 37 void ChannelInit::WillDestroySoon() {
40 if (channel_info_) 38 if (channel_info_)
41 WillDestroyChannelSoon(channel_info_); 39 WillDestroyChannelSoon(channel_info_);
42 } 40 }
43 41
44 // static 42 // static
45 void ChannelInit::OnCreatedChannel(base::WeakPtr<ChannelInit> self, 43 void ChannelInit::OnCreatedChannel(base::WeakPtr<ChannelInit> self,
46 scoped_refptr<base::TaskRunner> io_thread, 44 scoped_refptr<base::TaskRunner> io_thread,
47 embedder::ChannelInfo* channel) { 45 ChannelInfo* channel) {
48 // If |self| was already destroyed, shut the channel down. 46 // If |self| was already destroyed, shut the channel down.
49 if (!self) { 47 if (!self) {
50 DestroyChannel(channel); 48 DestroyChannel(channel);
51 return; 49 return;
52 } 50 }
53 51
54 self->channel_info_ = channel; 52 self->channel_info_ = channel;
55 } 53 }
56 54
57 } // namespace embedder 55 } // namespace embedder
58 } // namespace mojo 56 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/embedder/channel_init.h ('k') | mojo/embedder/embedder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698