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

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

Issue 597413002: Mojo: NULL -> nullptr in mojo/system and mojo/embedder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: EXPECT_TRUE Created 6 years, 3 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
« no previous file with comments | « no previous file | 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_(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) {
(...skipping 22 matching lines...) Expand all
47 if (!self) { 47 if (!self) {
48 DestroyChannel(channel); 48 DestroyChannel(channel);
49 return; 49 return;
50 } 50 }
51 51
52 self->channel_info_ = channel; 52 self->channel_info_ = channel;
53 } 53 }
54 54
55 } // namespace embedder 55 } // namespace embedder
56 } // namespace mojo 56 } // namespace mojo
OLDNEW
« no previous file with comments | « no previous file | mojo/embedder/embedder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698