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

Unified Diff: chrome/browser/devtools/tethering_adb_filter.h

Issue 22685003: Visualize status of port forwarding sockets in chrome:inspect Devices tab (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 4 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_protocol.cc ('k') | chrome/browser/devtools/tethering_adb_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « chrome/browser/devtools/devtools_protocol.cc ('k') | chrome/browser/devtools/tethering_adb_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698