diff options
author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-28 18:33:30 +0000 |
---|---|---|
committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-28 18:33:30 +0000 |
commit | 437a9f8fd20379f3314d1f515dca115dac0aaaaf (patch) | |
tree | 41f0d877f211d43bc87d2ef6e2a323d116227f2a /chromeos/network/network_state_handler.h | |
parent | 4520d538e9fe0beb97609e1f6438e6a71924c227 (diff) | |
download | chromium_src-437a9f8fd20379f3314d1f515dca115dac0aaaaf.zip chromium_src-437a9f8fd20379f3314d1f515dca115dac0aaaaf.tar.gz chromium_src-437a9f8fd20379f3314d1f515dca115dac0aaaaf.tar.bz2 |
Add NetworkHandler to own network handlers in src/chromeos/network
This is just some code cleanup and should have no behavior changes.
BUG=239073
For webui/chromeos, browser/geolocation:
TBR=nkostylev@chromium.org,joth@chromium.org
Review URL: https://chromiumcodereview.appspot.com/14729017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202609 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/network/network_state_handler.h')
-rw-r--r-- | chromeos/network/network_state_handler.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/chromeos/network/network_state_handler.h b/chromeos/network/network_state_handler.h index 072258d..a361e25 100644 --- a/chromeos/network/network_state_handler.h +++ b/chromeos/network/network_state_handler.h @@ -16,6 +16,7 @@ #include "base/observer_list.h" #include "chromeos/chromeos_export.h" #include "chromeos/network/managed_state.h" +#include "chromeos/network/network_handler.h" #include "chromeos/network/network_handler_callbacks.h" #include "chromeos/network/shill_property_handler.h" @@ -67,18 +68,6 @@ class CHROMEOS_EXPORT NetworkStateHandler virtual ~NetworkStateHandler(); - // Sets the global instance. Must be called before any calls to Get(). - static void Initialize(); - - // Returns true if the global instance has been initialized. - static bool IsInitialized(); - - // Destroys the global instance. - static void Shutdown(); - - // Gets the global instance. Initialize() must be called first. - static NetworkStateHandler* Get(); - // Add/remove observers. void AddObserver(NetworkStateHandlerObserver* observer); void RemoveObserver(NetworkStateHandlerObserver* observer); @@ -180,12 +169,16 @@ class CHROMEOS_EXPORT NetworkStateHandler void GetNetworkStatePropertiesForTest( base::DictionaryValue* dictionary) const; + // Construct and initialize an instance for testing. + static NetworkStateHandler* InitializeForTest(); + static const char kMatchTypeDefault[]; static const char kMatchTypeWireless[]; static const char kMatchTypeMobile[]; static const char kMatchTypeNonVirtual[]; protected: + friend class NetworkHandler; NetworkStateHandler(); // ShillPropertyHandler::Listener overrides. @@ -228,7 +221,7 @@ class CHROMEOS_EXPORT NetworkStateHandler virtual void ManagedStateListChanged( ManagedState::ManagedType type) OVERRIDE; - // Called in Initialize(). Called explicitly by tests after adding + // Called after construction. Called explicitly by tests after adding // test observers. void InitShillPropertyHandler(); |