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

Unified Diff: chromeos/network/shill_property_handler.h

Issue 13004024: Add ConnectToBestServices call when Certs are loaded (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Only call ConnectToBestWifi on intial cert load Created 7 years, 9 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
Index: chromeos/network/shill_property_handler.h
diff --git a/chromeos/network/shill_property_handler.h b/chromeos/network/shill_property_handler.h
index 66678acab34c7e73e6119c8bf1ec00b6ed8e7d96..154a65650651839789fbc5e756ae8a62128bf5fc 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> {
Greg Spencer (Chromium) 2013/04/01 19:37:18 Ooh, is that the new way to do weak pointer suppor
stevenjb 2013/04/01 20:34:48 It's not exactly new, I'm not sure why I usually u
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);
};

Powered by Google App Engine
This is Rietveld 408576698