DevTools: Make port forwarding part of DevToolsAndroidBridge.

chrome/browser/devtools/device/devtools_android_bridge.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_DEVTOOLS_DEVICE_DEVTOOLS_ANDROID_BRIDGE_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVICE_DEVTOOLS_ANDROID_BRIDGE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 15 matching lines @@
 class DictionaryValue;
 class ListValue;
 class Thread;
 }
 
 namespace content {
 class BrowserContext;
 }
 
 class DevToolsTargetImpl;
+class PortForwardingController;
 class Profile;
 
 class DevToolsAndroidBridge
     : public base::RefCountedThreadSafe<
           DevToolsAndroidBridge,
           content::BrowserThread::DeleteOnUIThread> {
  public:
   typedef base::Callback<void(int result,
                               const std::string& response)> Callback;
 
@@ skipping 155 matching lines @@
   class DeviceCountListener {
    public:
     virtual void DeviceCountChanged(int count) = 0;
    protected:
     virtual ~DeviceCountListener() {}
   };
 
   void AddDeviceCountListener(DeviceCountListener* listener);
   void RemoveDeviceCountListener(DeviceCountListener* listener);
 
+  typedef int PortStatus;

[dgozman, 2014/08/27 08:08:34]

Why this class doesn't expose status constants? What I am supposed to compare
status with?

[vkuzkokov, 2014/09/01 16:13:41]

Status is compared only in JS.

+  typedef std::map<int, PortStatus> PortStatusMap;
+  typedef std::map<std::string, PortStatusMap> DevicesStatus;
+
+  class PortForwardingListener {
+   public:
+    typedef DevToolsAndroidBridge::PortStatusMap PortStatusMap;
+    typedef DevToolsAndroidBridge::DevicesStatus DevicesStatus;
+
+    virtual void PortStatusChanged(const DevicesStatus&) = 0;
+   protected:
+    virtual ~PortForwardingListener() {}
+  };
+
+  void AddPortForwardingListener(PortForwardingListener* listener);
+  void RemovePortForwardingListener(PortForwardingListener* listener);
+
   void set_device_providers_for_test(
       const AndroidDeviceManager::DeviceProviders& device_providers) {
     device_manager_->SetDeviceProviders(device_providers);
   }
 
   void set_task_scheduler_for_test(
       base::Callback<void(const base::Closure&)> scheduler) {
     task_scheduler_ = scheduler;
   }
 
   static bool HasDevToolsWindow(const std::string& agent_id);
 
  private:
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::UI>;
   friend class base::DeleteHelper<DevToolsAndroidBridge>;
 
   virtual ~DevToolsAndroidBridge();
 
   void StartDeviceListPolling();
   void StopDeviceListPolling();
+  bool NeedsDeviceListPolling();
   void RequestDeviceList(
       const base::Callback<void(const RemoteDevices&)>& callback);
   void ReceivedDeviceList(const RemoteDevices& devices);
   void StartDeviceCountPolling();
   void StopDeviceCountPolling();
   void RequestDeviceCount(const base::Callback<void(int)>& callback);
   void ReceivedDeviceCount(int count);
 
   static void ScheduleTaskDefault(const base::Closure& task);
 
   void CreateDeviceProviders();
 
   Profile* profile_;
   scoped_refptr<AndroidDeviceManager> device_manager_;
   RemoteDevices devices_;
 
   typedef std::vector<DeviceListListener*> DeviceListListeners;
   DeviceListListeners device_list_listeners_;
   base::CancelableCallback<void(const RemoteDevices&)> device_list_callback_;
 
   typedef std::vector<DeviceCountListener*> DeviceCountListeners;
   DeviceCountListeners device_count_listeners_;
   base::CancelableCallback<void(int)> device_count_callback_;
   base::Callback<void(const base::Closure&)> task_scheduler_;
 
+  typedef std::vector<PortForwardingListener*> PortForwardingListeners;
+  PortForwardingListeners port_forwarding_listeners_;
+  scoped_ptr<PortForwardingController> port_forwarding_controller_;
+
   PrefChangeRegistrar pref_change_registrar_;
   DISALLOW_COPY_AND_ASSIGN(DevToolsAndroidBridge);
 };
 
 #endif  // CHROME_BROWSER_DEVTOOLS_DEVICE_DEVTOOLS_ANDROID_BRIDGE_H_