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

Side by Side Diff: chrome/browser/devtools/device/android_web_socket.cc

Issue 1551503002: Convert Pass()→std::move() in //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 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 <utility>
6
5 #include "base/location.h" 7 #include "base/location.h"
6 #include "base/macros.h" 8 #include "base/macros.h"
7 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
8 #include "base/rand_util.h" 10 #include "base/rand_util.h"
9 #include "base/single_thread_task_runner.h" 11 #include "base/single_thread_task_runner.h"
10 #include "base/thread_task_runner_handle.h" 12 #include "base/thread_task_runner_handle.h"
11 #include "chrome/browser/devtools/device/android_device_manager.h" 13 #include "chrome/browser/devtools/device/android_device_manager.h"
12 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
13 #include "net/base/io_buffer.h" 15 #include "net/base/io_buffer.h"
14 #include "net/base/net_errors.h" 16 #include "net/base/net_errors.h"
(...skipping 12 matching lines...) Expand all
27 class AndroidDeviceManager::AndroidWebSocket::WebSocketImpl { 29 class AndroidDeviceManager::AndroidWebSocket::WebSocketImpl {
28 public: 30 public:
29 WebSocketImpl( 31 WebSocketImpl(
30 scoped_refptr<base::SingleThreadTaskRunner> response_task_runner, 32 scoped_refptr<base::SingleThreadTaskRunner> response_task_runner,
31 base::WeakPtr<AndroidWebSocket> weak_socket, 33 base::WeakPtr<AndroidWebSocket> weak_socket,
32 const std::string& extensions, 34 const std::string& extensions,
33 const std::string& body_head, 35 const std::string& body_head,
34 scoped_ptr<net::StreamSocket> socket) 36 scoped_ptr<net::StreamSocket> socket)
35 : response_task_runner_(response_task_runner), 37 : response_task_runner_(response_task_runner),
36 weak_socket_(weak_socket), 38 weak_socket_(weak_socket),
37 socket_(socket.Pass()), 39 socket_(std::move(socket)),
38 encoder_(net::WebSocketEncoder::CreateClient(extensions)), 40 encoder_(net::WebSocketEncoder::CreateClient(extensions)),
39 response_buffer_(body_head) { 41 response_buffer_(body_head) {
40 thread_checker_.DetachFromThread(); 42 thread_checker_.DetachFromThread();
41 } 43 }
42 44
43 void StartListening() { 45 void StartListening() {
44 DCHECK(thread_checker_.CalledOnValidThread()); 46 DCHECK(thread_checker_.CalledOnValidThread());
45 DCHECK(socket_); 47 DCHECK(socket_);
46 48
47 scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(kBufferSize)); 49 scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(kBufferSize));
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 const std::string& extensions, 185 const std::string& extensions,
184 const std::string& body_head, 186 const std::string& body_head,
185 scoped_ptr<net::StreamSocket> socket) { 187 scoped_ptr<net::StreamSocket> socket) {
186 DCHECK_CURRENTLY_ON(BrowserThread::UI); 188 DCHECK_CURRENTLY_ON(BrowserThread::UI);
187 if (result != net::OK || !socket.get()) { 189 if (result != net::OK || !socket.get()) {
188 OnSocketClosed(); 190 OnSocketClosed();
189 return; 191 return;
190 } 192 }
191 socket_impl_ = new WebSocketImpl(base::ThreadTaskRunnerHandle::Get(), 193 socket_impl_ = new WebSocketImpl(base::ThreadTaskRunnerHandle::Get(),
192 weak_factory_.GetWeakPtr(), extensions, 194 weak_factory_.GetWeakPtr(), extensions,
193 body_head, socket.Pass()); 195 body_head, std::move(socket));
194 device_->task_runner_->PostTask(FROM_HERE, 196 device_->task_runner_->PostTask(FROM_HERE,
195 base::Bind(&WebSocketImpl::StartListening, 197 base::Bind(&WebSocketImpl::StartListening,
196 base::Unretained(socket_impl_))); 198 base::Unretained(socket_impl_)));
197 delegate_->OnSocketOpened(); 199 delegate_->OnSocketOpened();
198 } 200 }
199 201
200 void AndroidDeviceManager::AndroidWebSocket::OnFrameRead( 202 void AndroidDeviceManager::AndroidWebSocket::OnFrameRead(
201 const std::string& message) { 203 const std::string& message) {
202 DCHECK_CURRENTLY_ON(BrowserThread::UI); 204 DCHECK_CURRENTLY_ON(BrowserThread::UI);
203 delegate_->OnFrameRead(message); 205 delegate_->OnFrameRead(message);
(...skipping 18 matching lines...) Expand all
222 } 224 }
223 } 225 }
224 226
225 AndroidDeviceManager::AndroidWebSocket* 227 AndroidDeviceManager::AndroidWebSocket*
226 AndroidDeviceManager::Device::CreateWebSocket( 228 AndroidDeviceManager::Device::CreateWebSocket(
227 const std::string& socket_name, 229 const std::string& socket_name,
228 const std::string& path, 230 const std::string& path,
229 AndroidWebSocket::Delegate* delegate) { 231 AndroidWebSocket::Delegate* delegate) {
230 return new AndroidWebSocket(this, socket_name, path, delegate); 232 return new AndroidWebSocket(this, socket_name, path, delegate);
231 } 233 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698