| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/devtools_adb_bridge.h" | 5 #include "chrome/browser/devtools/devtools_adb_bridge.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/base64.h" | 10 #include "base/base64.h" |
| (...skipping 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1030 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 1030 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 1031 if (debug_url.empty()) | 1031 if (debug_url.empty()) |
| 1032 return; | 1032 return; |
| 1033 DevToolsProtocol::Command command(1, method, params); | 1033 DevToolsProtocol::Command command(1, method, params); |
| 1034 new AdbProtocolCommand( | 1034 new AdbProtocolCommand( |
| 1035 adb_thread_, device_, socket_, debug_url, command.Serialize()); | 1035 adb_thread_, device_, socket_, debug_url, command.Serialize()); |
| 1036 } | 1036 } |
| 1037 | 1037 |
| 1038 static void NoOp(int, const std::string&) {} | 1038 static void NoOp(int, const std::string&) {} |
| 1039 | 1039 |
| 1040 void DevToolsAdbBridge::RemoteBrowser::Open(const std::string& url) { | 1040 void DevToolsAdbBridge::RemoteBrowser::Open(const std::string& input_url) { |
| 1041 GURL gurl(input_url); |
| 1042 if (!gurl.is_valid()) { |
| 1043 gurl = GURL("http://" + input_url); |
| 1044 if (!gurl.is_valid()) |
| 1045 return; |
| 1046 } |
| 1047 std::string url = gurl.spec(); |
| 1048 |
| 1041 ParsedVersion parsed_version = GetParsedVersion(); | 1049 ParsedVersion parsed_version = GetParsedVersion(); |
| 1042 if (IsChrome() && | 1050 if (IsChrome() && |
| 1043 !parsed_version.empty() && | 1051 !parsed_version.empty() && |
| 1044 parsed_version[0] >= kMinVersionNewWithURL) { | 1052 parsed_version[0] >= kMinVersionNewWithURL) { |
| 1045 std::string query = net::EscapeQueryParamValue(url, false /* use_plus */); | 1053 std::string query = net::EscapeQueryParamValue(url, false /* use_plus */); |
| 1046 std::string request = | 1054 std::string request = |
| 1047 base::StringPrintf(kNewPageRequestWithURL, query.c_str()); | 1055 base::StringPrintf(kNewPageRequestWithURL, query.c_str()); |
| 1048 adb_thread_->message_loop()->PostTask(FROM_HERE, | 1056 adb_thread_->message_loop()->PostTask(FROM_HERE, |
| 1049 base::Bind(&AndroidDevice::HttpQuery, | 1057 base::Bind(&AndroidDevice::HttpQuery, |
| 1050 device_, socket_, request, base::Bind(&NoOp))); | 1058 device_, socket_, request, base::Bind(&NoOp))); |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1197 | 1205 |
| 1198 if (listeners_.empty()) | 1206 if (listeners_.empty()) |
| 1199 return; | 1207 return; |
| 1200 | 1208 |
| 1201 BrowserThread::PostDelayedTask( | 1209 BrowserThread::PostDelayedTask( |
| 1202 BrowserThread::UI, | 1210 BrowserThread::UI, |
| 1203 FROM_HERE, | 1211 FROM_HERE, |
| 1204 base::Bind(&DevToolsAdbBridge::RequestRemoteDevices, this), | 1212 base::Bind(&DevToolsAdbBridge::RequestRemoteDevices, this), |
| 1205 base::TimeDelta::FromMilliseconds(kAdbPollingIntervalMs)); | 1213 base::TimeDelta::FromMilliseconds(kAdbPollingIntervalMs)); |
| 1206 } | 1214 } |
| OLD | NEW |