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 219e5ced10000c7246493bda731c2e409a88800c..50711c5a586ec300554de9f007e2b2d918ec0e68 100644 |
--- a/chrome/browser/devtools/device/android_device_manager.h |
+++ b/chrome/browser/devtools/device/android_device_manager.h |
@@ -53,32 +53,22 @@ class AndroidDeviceManager |
typedef base::Callback<void(const DeviceInfo&)> DeviceInfoCallback; |
- class AndroidWebSocket : public base::RefCountedThreadSafe<AndroidWebSocket> { |
+ class AndroidWebSocket { |
public: |
class Delegate { |
public: |
virtual void OnSocketOpened() = 0; |
virtual void OnFrameRead(const std::string& message) = 0; |
- virtual void OnSocketClosed(bool closed_by_device) = 0; |
+ virtual void OnSocketClosed() = 0; |
protected: |
virtual ~Delegate() {} |
}; |
AndroidWebSocket() {} |
- |
- virtual void Connect() = 0; |
- virtual void Disconnect() = 0; |
- virtual void SendFrame(const std::string& message) = 0; |
- virtual void ClearDelegate() = 0; |
- |
- protected: |
virtual ~AndroidWebSocket() {} |
- private: |
- friend class base::RefCountedThreadSafe<AndroidWebSocket>; |
- |
- DISALLOW_COPY_AND_ASSIGN(AndroidWebSocket); |
dgozman
2014/08/08 14:17:28
Don't remove this.
vkuzkokov
2014/08/08 15:59:43
Class with pure virtual methods can't be copied or
|
+ virtual void SendFrame(const std::string& message) = 0; |
}; |
class DeviceProvider; |
@@ -103,7 +93,7 @@ class AndroidDeviceManager |
const std::string& url, |
const SocketCallback& callback); |
- scoped_refptr<AndroidWebSocket> CreateWebSocket( |
+ AndroidWebSocket* CreateWebSocket( |
const std::string& socket_name, |
const std::string& url, |
AndroidWebSocket::Delegate* delegate); |