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

Unified Diff: chrome/browser/devtools/device/android_device_manager.h

Issue 644963003: [DevTools] Port forwarding doesn't keep USB connection (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/websocket
Patch Set: Created 6 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
Index: chrome/browser/devtools/device/android_device_manager.h
diff --git a/chrome/browser/devtools/device/android_device_manager.h b/chrome/browser/devtools/device/android_device_manager.h
index 9ec795bca523f29bff4a6cc97b9003fc47d2205b..ab6c833fa5317ed04359a878bdb1b0c4d9153851 100644
--- a/chrome/browser/devtools/device/android_device_manager.h
+++ b/chrome/browser/devtools/device/android_device_manager.h
@@ -83,8 +83,9 @@ class AndroidDeviceManager
void Connected(int result, scoped_ptr<net::StreamSocket> socket);
void OnFrameRead(const std::string& message);
void OnSocketClosed();
+ void Terminate();
- scoped_refptr<Device> device_;
+ Device* device_;
std::string url_;
WebSocketImpl* socket_impl_;
Delegate* delegate_;
@@ -130,6 +131,7 @@ class AndroidDeviceManager
scoped_refptr<base::MessageLoopProxy> device_message_loop_;
scoped_refptr<DeviceProvider> provider_;
std::string serial_;
+ std::set<AndroidWebSocket*> sockets_;
base::WeakPtrFactory<Device> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(Device);

Powered by Google App Engine
This is Rietveld 408576698