| 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/self_device_provider.h" | 5 #include "chrome/browser/devtools/device/self_device_provider.h" |
| 6 | 6 |
| 7 #include "base/location.h" |
| 8 #include "base/single_thread_task_runner.h" |
| 7 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 8 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
| 11 #include "base/thread_task_runner_handle.h" |
| 9 #include "net/socket/tcp_client_socket.h" | 12 #include "net/socket/tcp_client_socket.h" |
| 10 | 13 |
| 11 namespace { | 14 namespace { |
| 12 | 15 |
| 13 const char kDeviceModel[] = "Local Chrome"; | 16 const char kDeviceModel[] = "Local Chrome"; |
| 14 const char kBrowserName[] = "Chrome"; | 17 const char kBrowserName[] = "Chrome"; |
| 15 const char kLocalhost[] = "127.0.0.1"; | 18 const char kLocalhost[] = "127.0.0.1"; |
| 16 const char kSerial[] = "local"; | 19 const char kSerial[] = "local"; |
| 17 | 20 |
| 18 static void RunSocketCallback( | 21 static void RunSocketCallback( |
| (...skipping 20 matching lines...) Expand all Loading... |
| 39 device_info.model = kDeviceModel; | 42 device_info.model = kDeviceModel; |
| 40 device_info.connected = true; | 43 device_info.connected = true; |
| 41 | 44 |
| 42 AndroidDeviceManager::BrowserInfo browser_info; | 45 AndroidDeviceManager::BrowserInfo browser_info; |
| 43 browser_info.socket_name = base::IntToString(port_); | 46 browser_info.socket_name = base::IntToString(port_); |
| 44 browser_info.display_name = kBrowserName; | 47 browser_info.display_name = kBrowserName; |
| 45 browser_info.type = AndroidDeviceManager::BrowserInfo::kTypeChrome; | 48 browser_info.type = AndroidDeviceManager::BrowserInfo::kTypeChrome; |
| 46 | 49 |
| 47 device_info.browser_info.push_back(browser_info); | 50 device_info.browser_info.push_back(browser_info); |
| 48 | 51 |
| 49 base::MessageLoop::current()->PostTask( | 52 base::ThreadTaskRunnerHandle::Get()->PostTask( |
| 50 FROM_HERE, base::Bind(callback, device_info)); | 53 FROM_HERE, base::Bind(callback, device_info)); |
| 51 } | 54 } |
| 52 | 55 |
| 53 void SelfAsDeviceProvider::OpenSocket(const std::string& serial, | 56 void SelfAsDeviceProvider::OpenSocket(const std::string& serial, |
| 54 const std::string& socket_name, | 57 const std::string& socket_name, |
| 55 const SocketCallback& callback) { | 58 const SocketCallback& callback) { |
| 56 // Use plain socket for remote debugging and port forwarding on Desktop | 59 // Use plain socket for remote debugging and port forwarding on Desktop |
| 57 // (debugging purposes). | 60 // (debugging purposes). |
| 58 net::IPAddressNumber ip_number; | 61 net::IPAddressNumber ip_number; |
| 59 net::ParseIPLiteralToNumber(kLocalhost, &ip_number); | 62 net::ParseIPLiteralToNumber(kLocalhost, &ip_number); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 73 release_callback_.Run(); | 76 release_callback_.Run(); |
| 74 } | 77 } |
| 75 | 78 |
| 76 void SelfAsDeviceProvider::set_release_callback_for_test( | 79 void SelfAsDeviceProvider::set_release_callback_for_test( |
| 77 const base::Closure& callback) { | 80 const base::Closure& callback) { |
| 78 release_callback_ = callback; | 81 release_callback_ = callback; |
| 79 } | 82 } |
| 80 | 83 |
| 81 SelfAsDeviceProvider::~SelfAsDeviceProvider() { | 84 SelfAsDeviceProvider::~SelfAsDeviceProvider() { |
| 82 } | 85 } |
| OLD | NEW |