summaryrefslogtreecommitdiffstats
path: root/content/browser/device_orientation/provider_impl.cc
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-04 14:17:11 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-04 14:17:11 +0000
commitdd32b127ce5deac52b24f493dac79195a30bf138 (patch)
treefe41d5b0b6fb1bcff0ccfc87a9f46cefee602723 /content/browser/device_orientation/provider_impl.cc
parent63b5c710324dc630a663eb76a6a4cc1372322830 (diff)
downloadchromium_src-dd32b127ce5deac52b24f493dac79195a30bf138.zip
chromium_src-dd32b127ce5deac52b24f493dac79195a30bf138.tar.gz
chromium_src-dd32b127ce5deac52b24f493dac79195a30bf138.tar.bz2
content: Use base::MessageLoop.
BUG=236029 R=avi@chromium.org Review URL: https://chromiumcodereview.appspot.com/14335017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198316 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/device_orientation/provider_impl.cc')
-rw-r--r--content/browser/device_orientation/provider_impl.cc48
1 files changed, 22 insertions, 26 deletions
diff --git a/content/browser/device_orientation/provider_impl.cc b/content/browser/device_orientation/provider_impl.cc
index 4b88764..59bdebf 100644
--- a/content/browser/device_orientation/provider_impl.cc
+++ b/content/browser/device_orientation/provider_impl.cc
@@ -27,7 +27,7 @@ class ProviderImpl::PollingThread : public base::Thread {
public:
PollingThread(const char* name,
base::WeakPtr<ProviderImpl> provider,
- MessageLoop* creator_loop);
+ base::MessageLoop* creator_loop);
virtual ~PollingThread();
// Method for creating a DataFetcher and starting the polling, if the fetcher
@@ -52,7 +52,7 @@ class ProviderImpl::PollingThread : public base::Thread {
// The Message Loop on which this object was created.
// Typically the I/O loop, but may be something else during testing.
- MessageLoop* creator_loop_;
+ base::MessageLoop* creator_loop_;
scoped_ptr<DataFetcher> data_fetcher_;
std::map<DeviceData::Type, scoped_refptr<const DeviceData> >
@@ -62,28 +62,24 @@ class ProviderImpl::PollingThread : public base::Thread {
base::WeakPtr<ProviderImpl> provider_;
};
-ProviderImpl::PollingThread::PollingThread(
- const char* name,
- base::WeakPtr<ProviderImpl> provider,
- MessageLoop* creator_loop)
- : base::Thread(name),
- creator_loop_(creator_loop),
- provider_(provider) {
-}
+ProviderImpl::PollingThread::PollingThread(const char* name,
+ base::WeakPtr<ProviderImpl> provider,
+ base::MessageLoop* creator_loop)
+ : base::Thread(name), creator_loop_(creator_loop), provider_(provider) {}
ProviderImpl::PollingThread::~PollingThread() {
Stop();
}
void ProviderImpl::PollingThread::DoAddPollingDataType(DeviceData::Type type) {
- DCHECK(MessageLoop::current() == message_loop());
+ DCHECK(base::MessageLoop::current() == message_loop());
polling_data_types_.insert(type);
}
void ProviderImpl::PollingThread::Initialize(DataFetcherFactory factory,
DeviceData::Type type) {
- DCHECK(MessageLoop::current() == message_loop());
+ DCHECK(base::MessageLoop::current() == message_loop());
if (factory != NULL) {
// Try to use factory to create a fetcher that can provide this type of
@@ -115,7 +111,7 @@ void ProviderImpl::PollingThread::Initialize(DataFetcherFactory factory,
void ProviderImpl::PollingThread::ScheduleDoNotify(
const scoped_refptr<const DeviceData>& device_data,
DeviceData::Type device_data_type) {
- DCHECK(MessageLoop::current() == message_loop());
+ DCHECK(base::MessageLoop::current() == message_loop());
creator_loop_->PostTask(FROM_HERE,
base::Bind(&ProviderImpl::DoNotify, provider_,
@@ -123,7 +119,7 @@ void ProviderImpl::PollingThread::ScheduleDoNotify(
}
void ProviderImpl::PollingThread::DoPoll() {
- DCHECK(MessageLoop::current() == message_loop());
+ DCHECK(base::MessageLoop::current() == message_loop());
// Poll the fetcher for each type of data.
typedef std::set<DeviceData::Type>::const_iterator SetIterator;
@@ -152,7 +148,7 @@ void ProviderImpl::PollingThread::DoPoll() {
}
void ProviderImpl::PollingThread::ScheduleDoPoll() {
- DCHECK(MessageLoop::current() == message_loop());
+ DCHECK(base::MessageLoop::current() == message_loop());
message_loop()->PostDelayedTask(
FROM_HERE,
@@ -161,7 +157,7 @@ void ProviderImpl::PollingThread::ScheduleDoPoll() {
}
base::TimeDelta ProviderImpl::PollingThread::SamplingInterval() const {
- DCHECK(MessageLoop::current() == message_loop());
+ DCHECK(base::MessageLoop::current() == message_loop());
DCHECK(data_fetcher_.get());
// TODO(erg): There used to be unused code here, that called a default
@@ -171,7 +167,7 @@ base::TimeDelta ProviderImpl::PollingThread::SamplingInterval() const {
}
ProviderImpl::ProviderImpl(DataFetcherFactory factory)
- : creator_loop_(MessageLoop::current()),
+ : creator_loop_(base::MessageLoop::current()),
factory_(factory),
weak_factory_(this),
polling_thread_(NULL) {
@@ -182,9 +178,9 @@ ProviderImpl::~ProviderImpl() {
}
void ProviderImpl::ScheduleDoAddPollingDataType(DeviceData::Type type) {
- DCHECK(MessageLoop::current() == creator_loop_);
+ DCHECK(base::MessageLoop::current() == creator_loop_);
- MessageLoop* polling_loop = polling_thread_->message_loop();
+ base::MessageLoop* polling_loop = polling_thread_->message_loop();
polling_loop->PostTask(FROM_HERE,
base::Bind(&PollingThread::DoAddPollingDataType,
base::Unretained(polling_thread_),
@@ -192,7 +188,7 @@ void ProviderImpl::ScheduleDoAddPollingDataType(DeviceData::Type type) {
}
void ProviderImpl::AddObserver(Observer* observer) {
- DCHECK(MessageLoop::current() == creator_loop_);
+ DCHECK(base::MessageLoop::current() == creator_loop_);
DeviceData::Type type = observer->device_data_type();
@@ -210,7 +206,7 @@ void ProviderImpl::AddObserver(Observer* observer) {
}
void ProviderImpl::RemoveObserver(Observer* observer) {
- DCHECK(MessageLoop::current() == creator_loop_);
+ DCHECK(base::MessageLoop::current() == creator_loop_);
observers_.erase(observer);
if (observers_.empty())
@@ -218,7 +214,7 @@ void ProviderImpl::RemoveObserver(Observer* observer) {
}
void ProviderImpl::Start(DeviceData::Type type) {
- DCHECK(MessageLoop::current() == creator_loop_);
+ DCHECK(base::MessageLoop::current() == creator_loop_);
DCHECK(!polling_thread_);
polling_thread_ = new PollingThread("Device data polling thread",
@@ -237,7 +233,7 @@ void ProviderImpl::Start(DeviceData::Type type) {
}
void ProviderImpl::Stop() {
- DCHECK(MessageLoop::current() == creator_loop_);
+ DCHECK(base::MessageLoop::current() == creator_loop_);
weak_factory_.InvalidateWeakPtrs();
if (polling_thread_) {
@@ -253,9 +249,9 @@ void ProviderImpl::Stop() {
void ProviderImpl::ScheduleInitializePollingThread(
DeviceData::Type device_data_type) {
- DCHECK(MessageLoop::current() == creator_loop_);
+ DCHECK(base::MessageLoop::current() == creator_loop_);
- MessageLoop* polling_loop = polling_thread_->message_loop();
+ base::MessageLoop* polling_loop = polling_thread_->message_loop();
polling_loop->PostTask(FROM_HERE,
base::Bind(&PollingThread::Initialize,
base::Unretained(polling_thread_),
@@ -265,7 +261,7 @@ void ProviderImpl::ScheduleInitializePollingThread(
void ProviderImpl::DoNotify(const scoped_refptr<const DeviceData>& data,
DeviceData::Type device_data_type) {
- DCHECK(MessageLoop::current() == creator_loop_);
+ DCHECK(base::MessageLoop::current() == creator_loop_);
// Update last notification of this type.
last_notifications_map_[device_data_type] = data;