diff options
| author | mvanouwerkerk@chromium.org <mvanouwerkerk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-23 15:01:17 +0000 |
|---|---|---|
| committer | mvanouwerkerk@chromium.org <mvanouwerkerk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-23 15:01:17 +0000 |
| commit | 296a9999fb46f314cfcc5492265273d99e6ced5c (patch) | |
| tree | fd6b1d2e11937ef1b0988ee23f994c54b48cbd4e /content/browser/geolocation/wifi_data_provider.cc | |
| parent | dda540b9975640716d72b9b954750541a826f2c2 (diff) | |
| download | chromium_src-296a9999fb46f314cfcc5492265273d99e6ced5c.zip chromium_src-296a9999fb46f314cfcc5492265273d99e6ced5c.tar.gz chromium_src-296a9999fb46f314cfcc5492265273d99e6ced5c.tar.bz2 | |
Replace DeviceDataProvider with the non-templated WifiDataProvider.
Also replace DeviceDataProvider::ListenerInterface with WifiDataProvider::WifiDataUpdateCallback. I would have preferred to do that as a separate change, but removing the templating revealed a nasty circular dependency that involved this nested class, which made forward declarations impossible. So, all in one go then.
I also deleted device_data_provider_unittest.cc as its purpose was to test for threading failures. These data providers no longer start their own threads, see https://codereview.chromium.org/22866005/
BUG=103713
TBR=jam
Review URL: https://chromiumcodereview.appspot.com/23181009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219279 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/geolocation/wifi_data_provider.cc')
| -rw-r--r-- | content/browser/geolocation/wifi_data_provider.cc | 95 |
1 files changed, 95 insertions, 0 deletions
diff --git a/content/browser/geolocation/wifi_data_provider.cc b/content/browser/geolocation/wifi_data_provider.cc new file mode 100644 index 0000000..416ecb8 --- /dev/null +++ b/content/browser/geolocation/wifi_data_provider.cc @@ -0,0 +1,95 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "content/browser/geolocation/wifi_data_provider.h" + +namespace content { + +// static +WifiDataProvider* WifiDataProvider::instance_ = NULL; + +// static +WifiDataProvider::ImplFactoryFunction WifiDataProvider::factory_function_ = + DefaultFactoryFunction; + +// static +WifiDataProvider* WifiDataProvider::Register(WifiDataUpdateCallback* callback) { + bool need_to_start_data_provider = false; + if (!instance_) { + instance_ = new WifiDataProvider(); + need_to_start_data_provider = true; + } + DCHECK(instance_); + instance_->AddCallback(callback); + // Start the provider after adding the callback, to avoid any race in + // it running early. + if (need_to_start_data_provider) + instance_->StartDataProvider(); + return instance_; +} + +WifiDataProviderImplBase::WifiDataProviderImplBase() + : container_(NULL), + client_loop_(base::MessageLoop::current()) { + DCHECK(client_loop_); +} + +WifiDataProviderImplBase::~WifiDataProviderImplBase() { +} + +void WifiDataProviderImplBase::SetContainer(WifiDataProvider* container) { + container_ = container; +} + +void WifiDataProviderImplBase::AddCallback(WifiDataUpdateCallback* callback) { + callbacks_.insert(callback); +} + +bool WifiDataProviderImplBase::RemoveCallback( + WifiDataUpdateCallback* callback) { + return callbacks_.erase(callback) == 1; +} + +bool WifiDataProviderImplBase::has_callbacks() const { + return !callbacks_.empty(); +} + +void WifiDataProviderImplBase::RunCallbacks() { + client_loop_->PostTask(FROM_HERE, base::Bind( + &WifiDataProviderImplBase::DoRunCallbacks, + this)); +} + +bool WifiDataProviderImplBase::CalledOnClientThread() const { + return base::MessageLoop::current() == this->client_loop_; +} + +base::MessageLoop* WifiDataProviderImplBase::client_loop() const { + return client_loop_; +} + +void WifiDataProviderImplBase::DoRunCallbacks() { + // It's possible that all the callbacks (and the container) went away + // whilst this task was pending. This is fine; the loop will be a no-op. + CallbackSet::const_iterator iter = callbacks_.begin(); + while (iter != callbacks_.end()) { + WifiDataUpdateCallback* callback = *iter; + ++iter; // Advance iter before running, in case callback unregisters. + callback->Run(container_); + } +} + +WifiDataProvider::WifiDataProvider() { + DCHECK(factory_function_); + impl_ = (*factory_function_)(); + DCHECK(impl_.get()); + impl_->SetContainer(this); +} + +WifiDataProvider::~WifiDataProvider() { + DCHECK(impl_.get()); + impl_->SetContainer(NULL); +} + +} // namespace content |