| Index: chrome/browser/devtools/tethering_adb_filter.h
|
| diff --git a/chrome/browser/devtools/tethering_adb_filter.h b/chrome/browser/devtools/tethering_adb_filter.h
|
| index 11c08b229f1645627a903d3a4042d3da9e022a17..af6e74c4cced02bb83e5c0a95db939e71725c37d 100644
|
| --- a/chrome/browser/devtools/tethering_adb_filter.h
|
| +++ b/chrome/browser/devtools/tethering_adb_filter.h
|
| @@ -22,17 +22,25 @@ class MessageLoop;
|
|
|
| class TetheringAdbFilter {
|
| public:
|
| + typedef DevToolsAdbBridge::RemoteDevice::PortStatus PortStatus;
|
| + typedef DevToolsAdbBridge::RemoteDevice::PortStatusMap PortStatusMap;
|
| +
|
| TetheringAdbFilter(scoped_refptr<DevToolsAdbBridge::AndroidDevice> device,
|
| base::MessageLoop* adb_message_loop,
|
| PrefService* pref_service,
|
| scoped_refptr<AdbWebSocket> web_socket);
|
| ~TetheringAdbFilter();
|
|
|
| + const PortStatusMap& GetPortStatusMap();
|
| +
|
| bool ProcessIncomingMessage(const std::string& message);
|
|
|
| private:
|
| typedef std::map<int, std::string> ForwardingMap;
|
|
|
| + typedef base::Callback<void(PortStatus)> CommandCallback;
|
| + typedef std::map<int, CommandCallback> CommandCallbackMap;
|
| +
|
| void OnPrefsChange();
|
|
|
| void ChangeForwardingMap(ForwardingMap map);
|
| @@ -42,6 +50,13 @@ class TetheringAdbFilter {
|
| const ForwardingMap& new_map);
|
|
|
| void SendCommand(const std::string& method, int port);
|
| + bool ProcessResponse(const std::string& json);
|
| +
|
| + void ProcessBindResponse(int port, PortStatus status);
|
| + void ProcessUnbindResponse(int port, PortStatus status);
|
| + void UpdateSocketCount(int port, int increment);
|
| + void UpdatePortStatusMap();
|
| + void UpdatePortStatusMapOnUIThread(const PortStatusMap& status_map);
|
|
|
| scoped_refptr<DevToolsAdbBridge::AndroidDevice> device_;
|
| base::MessageLoop* adb_message_loop_;
|
| @@ -49,6 +64,9 @@ class TetheringAdbFilter {
|
| scoped_refptr<AdbWebSocket> web_socket_;
|
| int command_id_;
|
| ForwardingMap forwarding_map_;
|
| + CommandCallbackMap pending_responses_;
|
| + PortStatusMap port_status_;
|
| + PortStatusMap port_status_on_ui_thread_;
|
| base::WeakPtrFactory<TetheringAdbFilter> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TetheringAdbFilter);
|
|
|