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

Side by Side Diff: chrome/browser/extensions/api/dial/dial_service.cc

Issue 1549233002: Convert Pass()→std::move() in //chrome/browser/extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/extensions/api/dial/dial_service.h" 5 #include "chrome/browser/extensions/api/dial/dial_service.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <set> 10 #include <set>
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 ++iter) 525 ++iter)
526 BindAndAddSocket(*iter); 526 BindAndAddSocket(*iter);
527 527
528 SendOneRequest(); 528 SendOneRequest();
529 } 529 }
530 530
531 void DialServiceImpl::BindAndAddSocket(const IPAddressNumber& bind_ip_address) { 531 void DialServiceImpl::BindAndAddSocket(const IPAddressNumber& bind_ip_address) {
532 scoped_ptr<DialServiceImpl::DialSocket> dial_socket(CreateDialSocket()); 532 scoped_ptr<DialServiceImpl::DialSocket> dial_socket(CreateDialSocket());
533 if (dial_socket->CreateAndBindSocket(bind_ip_address, net_log_, 533 if (dial_socket->CreateAndBindSocket(bind_ip_address, net_log_,
534 net_log_source_)) 534 net_log_source_))
535 dial_sockets_.push_back(dial_socket.Pass()); 535 dial_sockets_.push_back(std::move(dial_socket));
536 } 536 }
537 537
538 scoped_ptr<DialServiceImpl::DialSocket> DialServiceImpl::CreateDialSocket() { 538 scoped_ptr<DialServiceImpl::DialSocket> DialServiceImpl::CreateDialSocket() {
539 scoped_ptr<DialServiceImpl::DialSocket> dial_socket( 539 scoped_ptr<DialServiceImpl::DialSocket> dial_socket(
540 new DialServiceImpl::DialSocket( 540 new DialServiceImpl::DialSocket(
541 base::Bind(&DialServiceImpl::NotifyOnDiscoveryRequest, AsWeakPtr()), 541 base::Bind(&DialServiceImpl::NotifyOnDiscoveryRequest, AsWeakPtr()),
542 base::Bind(&DialServiceImpl::NotifyOnDeviceDiscovered, AsWeakPtr()), 542 base::Bind(&DialServiceImpl::NotifyOnDeviceDiscovered, AsWeakPtr()),
543 base::Bind(&DialServiceImpl::NotifyOnError, AsWeakPtr()))); 543 base::Bind(&DialServiceImpl::NotifyOnError, AsWeakPtr())));
544 return dial_socket.Pass(); 544 return dial_socket;
545 } 545 }
546 546
547 void DialServiceImpl::SendOneRequest() { 547 void DialServiceImpl::SendOneRequest() {
548 DCHECK(thread_checker_.CalledOnValidThread()); 548 DCHECK(thread_checker_.CalledOnValidThread());
549 if (num_requests_sent_ == max_requests_) { 549 if (num_requests_sent_ == max_requests_) {
550 VLOG(2) << "Reached max requests; stopping request timer."; 550 VLOG(2) << "Reached max requests; stopping request timer.";
551 request_timer_.Stop(); 551 request_timer_.Stop();
552 return; 552 return;
553 } 553 }
554 num_requests_sent_++; 554 num_requests_sent_++;
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 618
619 bool DialServiceImpl::HasOpenSockets() { 619 bool DialServiceImpl::HasOpenSockets() {
620 for (const auto& socket : dial_sockets_) { 620 for (const auto& socket : dial_sockets_) {
621 if (!socket->IsClosed()) 621 if (!socket->IsClosed())
622 return true; 622 return true;
623 } 623 }
624 return false; 624 return false;
625 } 625 }
626 626
627 } // namespace extensions 627 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/dial/dial_api.cc ('k') | chrome/browser/extensions/api/downloads/downloads_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698