summaryrefslogtreecommitdiffstats
path: root/chromeos/network/shill_property_handler.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromeos/network/shill_property_handler.h')
-rw-r--r--chromeos/network/shill_property_handler.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/chromeos/network/shill_property_handler.h b/chromeos/network/shill_property_handler.h
index 66678ac..154a656 100644
--- a/chromeos/network/shill_property_handler.h
+++ b/chromeos/network/shill_property_handler.h
@@ -38,7 +38,8 @@ class ShillPropertyObserver;
// It also observes Shill.Service for all services in Manager.ServiceWatchList.
// This class must not outlive the ShillManagerClient instance.
class CHROMEOS_EXPORT ShillPropertyHandler
- : public ShillPropertyChangedObserver {
+ : public ShillPropertyChangedObserver,
+ public base::SupportsWeakPtr<ShillPropertyHandler> {
public:
typedef std::map<std::string, ShillPropertyObserver*>
ShillPropertyObserverMap;
@@ -107,6 +108,9 @@ class CHROMEOS_EXPORT ShillPropertyHandler
// Requests an immediate network scan.
void RequestScan() const;
+ // Calls Manager.ConnectToBestServices().
+ void ConnectToBestServices() const;
+
// Requests all properties for the service or device (called for new items).
void RequestProperties(ManagedState::ManagedType type,
const std::string& path);
@@ -184,9 +188,6 @@ class CHROMEOS_EXPORT ShillPropertyHandler
std::set<std::string> enabled_technologies_;
std::set<std::string> uninitialized_technologies_;
- // For Shill client callbacks
- base::WeakPtrFactory<ShillPropertyHandler> weak_ptr_factory_;
-
DISALLOW_COPY_AND_ASSIGN(ShillPropertyHandler);
};