nexus: Cleanup the scanner and plug it all in so it works

Signed-off-by: San Mehat <san@google.com>

1 files changed, 8 insertions, 5 deletions

diff --git a/nexus/Supplicant.h b/nexus/Supplicant.h
index 3a796232d..579bfd61d 100644
--- a/nexus/Supplicant.h
+++ b/nexus/Supplicant.h
@@ -38,17 +38,20 @@ public:
     Supplicant();
     virtual ~Supplicant() {}
 
-    virtual int start();
-    virtual int stop();
-    virtual bool isStarted();
+    int start();
+    int stop();
+    bool isStarted();
+    int triggerScan(bool active);
+
+    ScanResultCollection *createLatestScanResults();
+    WifiNetworkCollection *createWifiNetworkList();
 
-    virtual int triggerScan(bool active);
 
     int getState() { return mState; }
 
-    ScanResultCollection *createLatestScanResults();
 
 // XXX: Extract these into an interface
+// handlers for SupplicantListener
 public:
     virtual int onConnectedEvent(SupplicantEvent *evt);
     virtual int onDisconnectedEvent(SupplicantEvent *evt);