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_profile_handler.cc | |
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_profile_handler.cc')
-rw-r--r-- | chromeos/network/network_profile_handler.cc | 55 |
1 files changed, 10 insertions, 45 deletions
diff --git a/chromeos/network/network_profile_handler.cc b/chromeos/network/network_profile_handler.cc index 30c8fde..cd6a8c6 100644 --- a/chromeos/network/network_profile_handler.cc +++ b/chromeos/network/network_profile_handler.cc @@ -18,8 +18,6 @@ namespace chromeos { -static NetworkProfileHandler* g_profile_handler_instance = NULL; - namespace { bool ConvertListValueToStringVector(const base::ListValue& string_list, @@ -54,51 +52,8 @@ class ProfilePathEquals { std::string path_; }; -class NetworkProfileHandlerImpl : public NetworkProfileHandler { - public: - NetworkProfileHandlerImpl() { - DBusThreadManager::Get()->GetShillManagerClient()-> - AddPropertyChangedObserver(this); - - // Request the initial profile list. - DBusThreadManager::Get()->GetShillManagerClient()->GetProperties( - base::Bind(&NetworkProfileHandler::GetManagerPropertiesCallback, - weak_ptr_factory_.GetWeakPtr())); - } - - virtual ~NetworkProfileHandlerImpl() { - DBusThreadManager::Get()->GetShillManagerClient()-> - RemovePropertyChangedObserver(this); - } -}; - } // namespace -// static -NetworkProfileHandler* NetworkProfileHandler::Initialize() { - CHECK(!g_profile_handler_instance); - g_profile_handler_instance = new NetworkProfileHandlerImpl(); - return g_profile_handler_instance; -} - -// static -bool NetworkProfileHandler::IsInitialized() { - return g_profile_handler_instance; -} - -// static -void NetworkProfileHandler::Shutdown() { - CHECK(g_profile_handler_instance); - delete g_profile_handler_instance; - g_profile_handler_instance = NULL; -} - -// static -NetworkProfileHandler* NetworkProfileHandler::Get() { - CHECK(g_profile_handler_instance); - return g_profile_handler_instance; -} - void NetworkProfileHandler::AddObserver(NetworkProfileObserver* observer) { observers_.AddObserver(observer); } @@ -139,6 +94,7 @@ void NetworkProfileHandler::OnPropertyChanged(const std::string& name, &new_profile_paths); DCHECK(result); + VLOG(2) << "Profiles: " << profiles_.size(); // Search for removed profiles. std::vector<std::string> removed_profile_paths; for (ProfileList::const_iterator it = profiles_.begin(); @@ -225,9 +181,18 @@ const NetworkProfile* NetworkProfileHandler::GetProfileForUserhash( NetworkProfileHandler::NetworkProfileHandler() : weak_ptr_factory_(this) { + DBusThreadManager::Get()->GetShillManagerClient()-> + AddPropertyChangedObserver(this); + + // Request the initial profile list. + DBusThreadManager::Get()->GetShillManagerClient()->GetProperties( + base::Bind(&NetworkProfileHandler::GetManagerPropertiesCallback, + weak_ptr_factory_.GetWeakPtr())); } NetworkProfileHandler::~NetworkProfileHandler() { + DBusThreadManager::Get()->GetShillManagerClient()-> + RemovePropertyChangedObserver(this); } } // namespace chromeos |