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

Unified Diff: chrome/browser/devtools/port_forwarding_controller.cc

Issue 26436003: DevTools: display 'Pending authentication' message upon raw usb debugging. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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
« no previous file with comments | « chrome/browser/devtools/devtools_adb_bridge.cc ('k') | chrome/browser/resources/inspect/inspect.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/devtools/port_forwarding_controller.cc
diff --git a/chrome/browser/devtools/port_forwarding_controller.cc b/chrome/browser/devtools/port_forwarding_controller.cc
index d7faa46bc39a17c8003d99ff9ce306ae4a941890..4f138e549b64ab52f83577135734b54d61b6f8fc 100644
--- a/chrome/browser/devtools/port_forwarding_controller.cc
+++ b/chrome/browser/devtools/port_forwarding_controller.cc
@@ -595,16 +595,16 @@ PortForwardingController::UpdateDeviceList(
for (DevToolsAdbBridge::RemoteDevices::const_iterator it = devices.begin();
it != devices.end(); ++it) {
scoped_refptr<DevToolsAdbBridge::RemoteDevice> device = *it;
- Registry::iterator rit = registry_.find(device->serial());
+ Registry::iterator rit = registry_.find(device->GetSerial());
Vladislav Kaznacheev 2013/10/08 16:42:37 How about adding device->IsConnected check and not
pfeldman 2013/10/08 17:11:04 Yep, thanks.
if (rit == registry_.end()) {
std::string socket = FindBestSocketForTethering(device->browsers());
- if (!socket.empty() || device->serial().empty()) {
+ if (!socket.empty() || device->GetSerial().empty()) {
// Will delete itself when disconnected.
new Connection(
&registry_, device->device(), socket, adb_thread_, pref_service_);
}
} else {
- status[device->serial()] = (*rit).second->GetPortStatusMap();
+ status[device->GetSerial()] = (*rit).second->GetPortStatusMap();
}
}
return status;
« no previous file with comments | « chrome/browser/devtools/devtools_adb_bridge.cc ('k') | chrome/browser/resources/inspect/inspect.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698