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

Side by Side Diff: chrome/browser/devtools/device/usb/android_usb_device.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 "chrome/browser/devtools/device/usb/android_usb_device.h" 5 #include "chrome/browser/devtools/device/usb/android_usb_device.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility>
8 9
9 #include "base/barrier_closure.h" 10 #include "base/barrier_closure.h"
10 #include "base/base64.h" 11 #include "base/base64.h"
11 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
12 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
13 #include "base/stl_util.h" 14 #include "base/stl_util.h"
14 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
15 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
16 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
17 #include "base/thread_task_runner_handle.h" 18 #include "base/thread_task_runner_handle.h"
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 void AndroidUsbDevice::Send(uint32_t command, 371 void AndroidUsbDevice::Send(uint32_t command,
371 uint32_t arg0, 372 uint32_t arg0,
372 uint32_t arg1, 373 uint32_t arg1,
373 const std::string& body) { 374 const std::string& body) {
374 scoped_ptr<AdbMessage> message(new AdbMessage(command, arg0, arg1, body)); 375 scoped_ptr<AdbMessage> message(new AdbMessage(command, arg0, arg1, body));
375 // Delay open request if not yet connected. 376 // Delay open request if not yet connected.
376 if (!is_connected_) { 377 if (!is_connected_) {
377 pending_messages_.push_back(message.release()); 378 pending_messages_.push_back(message.release());
378 return; 379 return;
379 } 380 }
380 Queue(message.Pass()); 381 Queue(std::move(message));
381 } 382 }
382 383
383 AndroidUsbDevice::~AndroidUsbDevice() { 384 AndroidUsbDevice::~AndroidUsbDevice() {
384 DCHECK(task_runner_->BelongsToCurrentThread()); 385 DCHECK(task_runner_->BelongsToCurrentThread());
385 Terminate(); 386 Terminate();
386 } 387 }
387 388
388 void AndroidUsbDevice::Queue(scoped_ptr<AdbMessage> message) { 389 void AndroidUsbDevice::Queue(scoped_ptr<AdbMessage> message) {
389 DCHECK(task_runner_->BelongsToCurrentThread()); 390 DCHECK(task_runner_->BelongsToCurrentThread());
390 391
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
598 Queue(make_scoped_ptr(*it)); 599 Queue(make_scoped_ptr(*it));
599 } 600 }
600 } 601 }
601 break; 602 break;
602 case AdbMessage::kCommandOKAY: 603 case AdbMessage::kCommandOKAY:
603 case AdbMessage::kCommandWRTE: 604 case AdbMessage::kCommandWRTE:
604 case AdbMessage::kCommandCLSE: 605 case AdbMessage::kCommandCLSE:
605 { 606 {
606 AndroidUsbSockets::iterator it = sockets_.find(message->arg1); 607 AndroidUsbSockets::iterator it = sockets_.find(message->arg1);
607 if (it != sockets_.end()) 608 if (it != sockets_.end())
608 it->second->HandleIncoming(message.Pass()); 609 it->second->HandleIncoming(std::move(message));
609 } 610 }
610 break; 611 break;
611 default: 612 default:
612 break; 613 break;
613 } 614 }
614 ReadHeader(); 615 ReadHeader();
615 } 616 }
616 617
617 void AndroidUsbDevice::TransferError(UsbTransferStatus status) { 618 void AndroidUsbDevice::TransferError(UsbTransferStatus status) {
618 DCHECK(task_runner_->BelongsToCurrentThread()); 619 DCHECK(task_runner_->BelongsToCurrentThread());
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
658 BrowserThread::PostTask( 659 BrowserThread::PostTask(
659 BrowserThread::UI, FROM_HERE, 660 BrowserThread::UI, FROM_HERE,
660 base::Bind(&ReleaseInterface, usb_handle, interface_id_)); 661 base::Bind(&ReleaseInterface, usb_handle, interface_id_));
661 } 662 }
662 663
663 void AndroidUsbDevice::SocketDeleted(uint32_t socket_id) { 664 void AndroidUsbDevice::SocketDeleted(uint32_t socket_id) {
664 DCHECK(task_runner_->BelongsToCurrentThread()); 665 DCHECK(task_runner_->BelongsToCurrentThread());
665 666
666 sockets_.erase(socket_id); 667 sockets_.erase(socket_id);
667 } 668 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698