OLD | NEW |
---|---|
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/android_device_manager.h" | 5 #include "chrome/browser/devtools/device/android_device_manager.h" |
6 | 6 |
7 #include "base/strings/string_number_conversions.h" | 7 #include "base/strings/string_number_conversions.h" |
8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
10 #include "net/base/io_buffer.h" | 10 #include "net/base/io_buffer.h" |
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
382 scoped_refptr<base::MessageLoopProxy> device_message_loop, | 382 scoped_refptr<base::MessageLoopProxy> device_message_loop, |
383 scoped_refptr<DeviceProvider> provider, | 383 scoped_refptr<DeviceProvider> provider, |
384 const std::string& serial) | 384 const std::string& serial) |
385 : device_message_loop_(device_message_loop), | 385 : device_message_loop_(device_message_loop), |
386 provider_(provider), | 386 provider_(provider), |
387 serial_(serial), | 387 serial_(serial), |
388 weak_factory_(this) { | 388 weak_factory_(this) { |
389 } | 389 } |
390 | 390 |
391 AndroidDeviceManager::Device::~Device() { | 391 AndroidDeviceManager::Device::~Device() { |
392 std::set<AndroidWebSocket*> sockets_copy(sockets_); | |
393 for (AndroidWebSocket* socket : sockets_copy) | |
394 socket->Terminate(); | |
dgozman
2014/10/21 11:54:02
I think this should issue Delegate::OnSocketClosed
vkuzkokov
2014/10/21 13:00:53
It should. Fixed.
| |
395 | |
392 provider_->AddRef(); | 396 provider_->AddRef(); |
393 DeviceProvider* raw_ptr = provider_.get(); | 397 DeviceProvider* raw_ptr = provider_.get(); |
394 provider_ = NULL; | 398 provider_ = NULL; |
395 device_message_loop_->PostTask( | 399 device_message_loop_->PostTask( |
396 FROM_HERE, | 400 FROM_HERE, |
397 base::Bind(&ReleaseDeviceAndProvider, | 401 base::Bind(&ReleaseDeviceAndProvider, |
398 base::Unretained(raw_ptr), | 402 base::Unretained(raw_ptr), |
399 serial_)); | 403 serial_)); |
400 } | 404 } |
401 | 405 |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
495 it->provider, it->serial); | 499 it->provider, it->serial); |
496 } else { | 500 } else { |
497 device = found->second.get(); | 501 device = found->second.get(); |
498 } | 502 } |
499 response.push_back(device); | 503 response.push_back(device); |
500 new_devices[it->serial] = device->weak_factory_.GetWeakPtr(); | 504 new_devices[it->serial] = device->weak_factory_.GetWeakPtr(); |
501 } | 505 } |
502 devices_.swap(new_devices); | 506 devices_.swap(new_devices); |
503 callback.Run(response); | 507 callback.Run(response); |
504 } | 508 } |
OLD | NEW |