Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/geolocation/geolocation_provider_impl.h" | 5 #include "content/browser/geolocation/geolocation_provider_impl.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/memory/ptr_util.h" | 12 #include "base/memory/ptr_util.h" |
| 13 #include "base/memory/singleton.h" | 13 #include "base/memory/singleton.h" |
| 14 #include "base/single_thread_task_runner.h" | 14 #include "base/single_thread_task_runner.h" |
| 15 #include "content/browser/geolocation/location_arbitrator_impl.h" | 15 #include "content/browser/geolocation/location_arbitrator_impl.h" |
| 16 #include "content/public/browser/browser_thread.h" | 16 #include "content/public/browser/browser_thread.h" |
| 17 #include "content/public/browser/content_browser_client.h" | |
| 18 #include "content/public/common/content_client.h" | |
|
Michael van Ouwerkerk
2016/06/09 13:03:10
What are these includes used for? I can't find any
CJ
2016/06/09 20:31:50
Forgot to remove them. My bad.
| |
| 17 | 19 |
| 18 namespace content { | 20 namespace content { |
| 19 | 21 |
| 20 GeolocationProvider* GeolocationProvider::GetInstance() { | 22 GeolocationProvider* GeolocationProvider::GetInstance() { |
| 21 return GeolocationProviderImpl::GetInstance(); | 23 return GeolocationProviderImpl::GetInstance(); |
| 22 } | 24 } |
| 23 | 25 |
| 24 std::unique_ptr<GeolocationProvider::Subscription> | 26 std::unique_ptr<GeolocationProvider::Subscription> |
| 25 GeolocationProviderImpl::AddLocationUpdateCallback( | 27 GeolocationProviderImpl::AddLocationUpdateCallback( |
| 26 const LocationUpdateCallback& callback, | 28 const LocationUpdateCallback& callback, |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 171 } | 173 } |
| 172 | 174 |
| 173 std::unique_ptr<LocationArbitrator> | 175 std::unique_ptr<LocationArbitrator> |
| 174 GeolocationProviderImpl::CreateArbitrator() { | 176 GeolocationProviderImpl::CreateArbitrator() { |
| 175 LocationArbitratorImpl::LocationUpdateCallback callback = base::Bind( | 177 LocationArbitratorImpl::LocationUpdateCallback callback = base::Bind( |
| 176 &GeolocationProviderImpl::OnLocationUpdate, base::Unretained(this)); | 178 &GeolocationProviderImpl::OnLocationUpdate, base::Unretained(this)); |
| 177 return base::WrapUnique(new LocationArbitratorImpl(callback)); | 179 return base::WrapUnique(new LocationArbitratorImpl(callback)); |
| 178 } | 180 } |
| 179 | 181 |
| 180 } // namespace content | 182 } // namespace content |
| OLD | NEW |