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 <stddef.h> | 7 #include <stddef.h> |
8 #include <string.h> | 8 #include <string.h> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
324 provider->ReleaseDevice(serial); | 324 provider->ReleaseDevice(serial); |
325 provider->Release(); | 325 provider->Release(); |
326 } | 326 } |
327 | 327 |
328 } // namespace | 328 } // namespace |
329 | 329 |
330 AndroidDeviceManager::BrowserInfo::BrowserInfo() | 330 AndroidDeviceManager::BrowserInfo::BrowserInfo() |
331 : type(kTypeOther) { | 331 : type(kTypeOther) { |
332 } | 332 } |
333 | 333 |
| 334 AndroidDeviceManager::BrowserInfo::BrowserInfo(const BrowserInfo& other) = |
| 335 default; |
| 336 |
334 AndroidDeviceManager::DeviceInfo::DeviceInfo() | 337 AndroidDeviceManager::DeviceInfo::DeviceInfo() |
335 : model(kModelOffline), connected(false) { | 338 : model(kModelOffline), connected(false) { |
336 } | 339 } |
337 | 340 |
| 341 AndroidDeviceManager::DeviceInfo::DeviceInfo(const DeviceInfo& other) = default; |
| 342 |
338 AndroidDeviceManager::DeviceInfo::~DeviceInfo() { | 343 AndroidDeviceManager::DeviceInfo::~DeviceInfo() { |
339 } | 344 } |
340 | 345 |
341 AndroidDeviceManager::DeviceDescriptor::DeviceDescriptor() { | 346 AndroidDeviceManager::DeviceDescriptor::DeviceDescriptor() { |
342 } | 347 } |
343 | 348 |
| 349 AndroidDeviceManager::DeviceDescriptor::DeviceDescriptor( |
| 350 const DeviceDescriptor& other) = default; |
| 351 |
344 AndroidDeviceManager::DeviceDescriptor::~DeviceDescriptor() { | 352 AndroidDeviceManager::DeviceDescriptor::~DeviceDescriptor() { |
345 } | 353 } |
346 | 354 |
347 void AndroidDeviceManager::DeviceProvider::SendJsonRequest( | 355 void AndroidDeviceManager::DeviceProvider::SendJsonRequest( |
348 const std::string& serial, | 356 const std::string& serial, |
349 const std::string& socket_name, | 357 const std::string& socket_name, |
350 const std::string& request, | 358 const std::string& request, |
351 const CommandCallback& callback) { | 359 const CommandCallback& callback) { |
352 OpenSocket(serial, | 360 OpenSocket(serial, |
353 socket_name, | 361 socket_name, |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
542 new Device(handler_thread_->message_loop(), it->provider, it->serial); | 550 new Device(handler_thread_->message_loop(), it->provider, it->serial); |
543 } else { | 551 } else { |
544 device = found->second.get(); | 552 device = found->second.get(); |
545 } | 553 } |
546 response.push_back(device); | 554 response.push_back(device); |
547 new_devices[it->serial] = device->weak_factory_.GetWeakPtr(); | 555 new_devices[it->serial] = device->weak_factory_.GetWeakPtr(); |
548 } | 556 } |
549 devices_.swap(new_devices); | 557 devices_.swap(new_devices); |
550 callback.Run(response); | 558 callback.Run(response); |
551 } | 559 } |
OLD | NEW |