Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2447)

Unified Diff: chrome/browser/devtools/device/devtools_android_bridge.cc

Issue 912863002: [DevTools] Remote JSON requests from javascript (Chromium side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed test Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/devtools/device/devtools_android_bridge.cc
diff --git a/chrome/browser/devtools/device/devtools_android_bridge.cc b/chrome/browser/devtools/device/devtools_android_bridge.cc
index 5f5ddb5a04ef5168411a6d239e72f12cfbe2dbe8..4f6762a2c945e84de40c7c3dd36ac1ae2e21f893 100644
--- a/chrome/browser/devtools/device/devtools_android_bridge.cc
+++ b/chrome/browser/devtools/device/devtools_android_bridge.cc
@@ -71,6 +71,16 @@ bool IsWebRTCDeviceProviderEnabled() {
switches::kEnableDevToolsExperiments);
}
+bool BrowserIdFromString(const std::string& browser_id_str,
+ DevToolsAndroidBridge::BrowserId* browser_id) {
+ size_t colon_pos = browser_id_str.find(':');
+ if (colon_pos == std::string::npos)
+ return false;
+ browser_id->first = browser_id_str.substr(0, colon_pos);
+ browser_id->second = browser_id_str.substr(colon_pos + 1);
+ return true;
+}
+
} // namespace
// DiscoveryRequest -----------------------------------------------------
@@ -678,6 +688,18 @@ DevToolsAndroidBridge::GetBrowserAgentHost(
browser->IsWebView());
}
+void DevToolsAndroidBridge::SendJsonRequest(
+ const std::string& browser_id_str,
+ const std::string& url,
+ const JsonRequestCallback& callback) {
+ BrowserId browser_id;
+ if (!BrowserIdFromString(browser_id_str, &browser_id)) {
+ callback.Run(net::ERR_FAILED, std::string());
+ return;
+ }
+ SendJsonRequest(browser_id, url, callback);
+}
+
scoped_refptr<AndroidDeviceManager::Device> DevToolsAndroidBridge::FindDevice(
const std::string& serial) {
DeviceMap::iterator it = device_map_.find(serial);

Powered by Google App Engine
This is Rietveld 408576698