OLD | NEW |
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 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
518 } | 518 } |
519 | 519 |
520 for (const auto& address : ip_addresses) { | 520 for (const auto& address : ip_addresses) { |
521 BindAndAddSocket(address); | 521 BindAndAddSocket(address); |
522 } | 522 } |
523 | 523 |
524 SendOneRequest(); | 524 SendOneRequest(); |
525 } | 525 } |
526 | 526 |
527 void DialServiceImpl::BindAndAddSocket(const IPAddress& bind_ip_address) { | 527 void DialServiceImpl::BindAndAddSocket(const IPAddress& bind_ip_address) { |
528 scoped_ptr<DialServiceImpl::DialSocket> dial_socket(CreateDialSocket()); | 528 std::unique_ptr<DialServiceImpl::DialSocket> dial_socket(CreateDialSocket()); |
529 if (dial_socket->CreateAndBindSocket(bind_ip_address, net_log_, | 529 if (dial_socket->CreateAndBindSocket(bind_ip_address, net_log_, |
530 net_log_source_)) | 530 net_log_source_)) |
531 dial_sockets_.push_back(std::move(dial_socket)); | 531 dial_sockets_.push_back(std::move(dial_socket)); |
532 } | 532 } |
533 | 533 |
534 scoped_ptr<DialServiceImpl::DialSocket> DialServiceImpl::CreateDialSocket() { | 534 std::unique_ptr<DialServiceImpl::DialSocket> |
535 scoped_ptr<DialServiceImpl::DialSocket> dial_socket( | 535 DialServiceImpl::CreateDialSocket() { |
| 536 std::unique_ptr<DialServiceImpl::DialSocket> dial_socket( |
536 new DialServiceImpl::DialSocket( | 537 new DialServiceImpl::DialSocket( |
537 base::Bind(&DialServiceImpl::NotifyOnDiscoveryRequest, AsWeakPtr()), | 538 base::Bind(&DialServiceImpl::NotifyOnDiscoveryRequest, AsWeakPtr()), |
538 base::Bind(&DialServiceImpl::NotifyOnDeviceDiscovered, AsWeakPtr()), | 539 base::Bind(&DialServiceImpl::NotifyOnDeviceDiscovered, AsWeakPtr()), |
539 base::Bind(&DialServiceImpl::NotifyOnError, AsWeakPtr()))); | 540 base::Bind(&DialServiceImpl::NotifyOnError, AsWeakPtr()))); |
540 return dial_socket; | 541 return dial_socket; |
541 } | 542 } |
542 | 543 |
543 void DialServiceImpl::SendOneRequest() { | 544 void DialServiceImpl::SendOneRequest() { |
544 DCHECK(thread_checker_.CalledOnValidThread()); | 545 DCHECK(thread_checker_.CalledOnValidThread()); |
545 if (num_requests_sent_ == max_requests_) { | 546 if (num_requests_sent_ == max_requests_) { |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
614 | 615 |
615 bool DialServiceImpl::HasOpenSockets() { | 616 bool DialServiceImpl::HasOpenSockets() { |
616 for (const auto& socket : dial_sockets_) { | 617 for (const auto& socket : dial_sockets_) { |
617 if (!socket->IsClosed()) | 618 if (!socket->IsClosed()) |
618 return true; | 619 return true; |
619 } | 620 } |
620 return false; | 621 return false; |
621 } | 622 } |
622 | 623 |
623 } // namespace extensions | 624 } // namespace extensions |
OLD | NEW |