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

Side by Side Diff: remoting/host/native_messaging/pipe_messaging_channel.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 5 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 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/pipe_messaging_channel.h" 5 #include "remoting/host/native_messaging/pipe_messaging_channel.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 25 matching lines...) Expand all
36 return base::File(result); 36 return base::File(result);
37 #else 37 #else
38 #error Not implemented. 38 #error Not implemented.
39 #endif 39 #endif
40 } 40 }
41 41
42 } // namespace 42 } // namespace
43 43
44 namespace remoting { 44 namespace remoting {
45 45
46 PipeMessagingChannel::PipeMessagingChannel( 46 PipeMessagingChannel::PipeMessagingChannel(base::File input, base::File output)
47 base::File input, 47 : native_messaging_reader_(DuplicatePlatformFile(std::move(input))),
48 base::File output) 48 native_messaging_writer_(
49 : native_messaging_reader_(DuplicatePlatformFile(input.Pass())), 49 new NativeMessagingWriter(DuplicatePlatformFile(std::move(output)))),
50 native_messaging_writer_(new NativeMessagingWriter(
51 DuplicatePlatformFile(output.Pass()))),
52 event_handler_(nullptr), 50 event_handler_(nullptr),
53 weak_factory_(this) { 51 weak_factory_(this) {
54 weak_ptr_ = weak_factory_.GetWeakPtr(); 52 weak_ptr_ = weak_factory_.GetWeakPtr();
55 } 53 }
56 54
57 PipeMessagingChannel::~PipeMessagingChannel() { 55 PipeMessagingChannel::~PipeMessagingChannel() {
58 } 56 }
59 57
60 void PipeMessagingChannel::Start(EventHandler* event_handler) { 58 void PipeMessagingChannel::Start(EventHandler* event_handler) {
61 DCHECK(CalledOnValidThread()); 59 DCHECK(CalledOnValidThread());
62 DCHECK(!event_handler_); 60 DCHECK(!event_handler_);
63 61
64 event_handler_ = event_handler; 62 event_handler_ = event_handler;
65 DCHECK(event_handler_); 63 DCHECK(event_handler_);
66 64
67 native_messaging_reader_.Start( 65 native_messaging_reader_.Start(
68 base::Bind(&PipeMessagingChannel::ProcessMessage, weak_ptr_), 66 base::Bind(&PipeMessagingChannel::ProcessMessage, weak_ptr_),
69 base::Bind(&PipeMessagingChannel::Shutdown, weak_ptr_)); 67 base::Bind(&PipeMessagingChannel::Shutdown, weak_ptr_));
70 } 68 }
71 69
72 void PipeMessagingChannel::ProcessMessage(scoped_ptr<base::Value> message) { 70 void PipeMessagingChannel::ProcessMessage(scoped_ptr<base::Value> message) {
73 DCHECK(CalledOnValidThread()); 71 DCHECK(CalledOnValidThread());
74 72
75 if (event_handler_) 73 if (event_handler_)
76 event_handler_->OnMessage(message.Pass()); 74 event_handler_->OnMessage(std::move(message));
77 } 75 }
78 76
79 void PipeMessagingChannel::SendMessage( 77 void PipeMessagingChannel::SendMessage(scoped_ptr<base::Value> message) {
80 scoped_ptr<base::Value> message) {
81 DCHECK(CalledOnValidThread()); 78 DCHECK(CalledOnValidThread());
82 79
83 bool success = message && native_messaging_writer_; 80 bool success = message && native_messaging_writer_;
84 if (success) 81 if (success)
85 success = native_messaging_writer_->WriteMessage(*message); 82 success = native_messaging_writer_->WriteMessage(*message);
86 83
87 if (!success) { 84 if (!success) {
88 // Close the write pipe so no more responses will be sent. 85 // Close the write pipe so no more responses will be sent.
89 native_messaging_writer_.reset(); 86 native_messaging_writer_.reset();
90 Shutdown(); 87 Shutdown();
91 } 88 }
92 } 89 }
93 90
94 void PipeMessagingChannel::Shutdown() { 91 void PipeMessagingChannel::Shutdown() {
95 DCHECK(CalledOnValidThread()); 92 DCHECK(CalledOnValidThread());
96 93
97 if (event_handler_) { 94 if (event_handler_) {
98 // Set |event_handler_| to nullptr to indicate the object is in a shutdown 95 // Set |event_handler_| to nullptr to indicate the object is in a shutdown
99 // cycle. Since event_handler->OnDisconnect() will destroy the current 96 // cycle. Since event_handler->OnDisconnect() will destroy the current
100 // object, |event_handler_| will become a dangling pointer after 97 // object, |event_handler_| will become a dangling pointer after
101 // OnDisconnect() returns. Therefore, we set |event_handler_| to nullptr 98 // OnDisconnect() returns. Therefore, we set |event_handler_| to nullptr
102 // beforehand. 99 // beforehand.
103 EventHandler* handler = event_handler_; 100 EventHandler* handler = event_handler_;
104 event_handler_ = nullptr; 101 event_handler_ = nullptr;
105 handler->OnDisconnect(); 102 handler->OnDisconnect();
106 } 103 }
107 } 104 }
108 105
109 } // namespace remoting 106 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698