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

Side by Side Diff: remoting/host/native_messaging/native_messaging_reader.cc

Issue 1549493004: Use std::move() instead of .Pass() in remoting/host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_not_pass
Patch Set: Created 4 years, 12 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "remoting/host/native_messaging/native_messaging_reader.h" 5 #include "remoting/host/native_messaging/native_messaging_reader.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/files/file.h" 10 #include "base/files/file.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 scoped_refptr<base::SequencedTaskRunner> read_task_runner_; 60 scoped_refptr<base::SequencedTaskRunner> read_task_runner_;
61 61
62 DISALLOW_COPY_AND_ASSIGN(Core); 62 DISALLOW_COPY_AND_ASSIGN(Core);
63 }; 63 };
64 64
65 NativeMessagingReader::Core::Core( 65 NativeMessagingReader::Core::Core(
66 base::File file, 66 base::File file,
67 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 67 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
68 scoped_refptr<base::SequencedTaskRunner> read_task_runner, 68 scoped_refptr<base::SequencedTaskRunner> read_task_runner,
69 base::WeakPtr<NativeMessagingReader> reader) 69 base::WeakPtr<NativeMessagingReader> reader)
70 : read_stream_(file.Pass()), 70 : read_stream_(std::move(file)),
71 reader_(reader), 71 reader_(reader),
72 caller_task_runner_(caller_task_runner), 72 caller_task_runner_(caller_task_runner),
73 read_task_runner_(read_task_runner) { 73 read_task_runner_(read_task_runner) {
74 } 74 }
75 75
76 NativeMessagingReader::Core::~Core() {} 76 NativeMessagingReader::Core::~Core() {}
77 77
78 void NativeMessagingReader::Core::ReadMessage() { 78 void NativeMessagingReader::Core::ReadMessage() {
79 DCHECK(read_task_runner_->RunsTasksOnCurrentThread()); 79 DCHECK(read_task_runner_->RunsTasksOnCurrentThread());
80 80
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 caller_task_runner_->PostTask( 128 caller_task_runner_->PostTask(
129 FROM_HERE, 129 FROM_HERE,
130 base::Bind(&NativeMessagingReader::InvokeEofCallback, reader_)); 130 base::Bind(&NativeMessagingReader::InvokeEofCallback, reader_));
131 } 131 }
132 132
133 NativeMessagingReader::NativeMessagingReader(base::File file) 133 NativeMessagingReader::NativeMessagingReader(base::File file)
134 : reader_thread_("Reader"), 134 : reader_thread_("Reader"),
135 weak_factory_(this) { 135 weak_factory_(this) {
136 reader_thread_.Start(); 136 reader_thread_.Start();
137 read_task_runner_ = reader_thread_.task_runner(); 137 read_task_runner_ = reader_thread_.task_runner();
138 core_.reset(new Core(file.Pass(), base::ThreadTaskRunnerHandle::Get(), 138 core_.reset(new Core(std::move(file), base::ThreadTaskRunnerHandle::Get(),
139 read_task_runner_, weak_factory_.GetWeakPtr())); 139 read_task_runner_, weak_factory_.GetWeakPtr()));
140 } 140 }
141 141
142 NativeMessagingReader::~NativeMessagingReader() { 142 NativeMessagingReader::~NativeMessagingReader() {
143 read_task_runner_->DeleteSoon(FROM_HERE, core_.release()); 143 read_task_runner_->DeleteSoon(FROM_HERE, core_.release());
144 } 144 }
145 145
146 void NativeMessagingReader::Start(MessageCallback message_callback, 146 void NativeMessagingReader::Start(MessageCallback message_callback,
147 base::Closure eof_callback) { 147 base::Closure eof_callback) {
148 message_callback_ = message_callback; 148 message_callback_ = message_callback;
149 eof_callback_ = eof_callback; 149 eof_callback_ = eof_callback;
150 150
151 // base::Unretained is safe since |core_| is only deleted via the 151 // base::Unretained is safe since |core_| is only deleted via the
152 // DeleteSoon task which is posted from this class's dtor. 152 // DeleteSoon task which is posted from this class's dtor.
153 read_task_runner_->PostTask( 153 read_task_runner_->PostTask(
154 FROM_HERE, base::Bind(&NativeMessagingReader::Core::ReadMessage, 154 FROM_HERE, base::Bind(&NativeMessagingReader::Core::ReadMessage,
155 base::Unretained(core_.get()))); 155 base::Unretained(core_.get())));
156 } 156 }
157 157
158 void NativeMessagingReader::InvokeMessageCallback( 158 void NativeMessagingReader::InvokeMessageCallback(
159 scoped_ptr<base::Value> message) { 159 scoped_ptr<base::Value> message) {
160 message_callback_.Run(message.Pass()); 160 message_callback_.Run(std::move(message));
161 } 161 }
162 162
163 void NativeMessagingReader::InvokeEofCallback() { 163 void NativeMessagingReader::InvokeEofCallback() {
164 eof_callback_.Run(); 164 eof_callback_.Run();
165 } 165 }
166 166
167 } // namespace remoting 167 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698