| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/location_arbitrator.h" | 5 #include "content/browser/geolocation/location_arbitrator.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 | 8 |
| 9 #include "chrome/browser/profiles/profile.h" | |
| 10 #include "content/browser/geolocation/arbitrator_dependency_factory.h" | 9 #include "content/browser/geolocation/arbitrator_dependency_factory.h" |
| 11 | 10 |
| 12 namespace { | 11 namespace { |
| 13 | 12 |
| 14 const char* kDefaultNetworkProviderUrl = "https://www.google.com/loc/json"; | 13 const char* kDefaultNetworkProviderUrl = "https://www.google.com/loc/json"; |
| 15 GeolocationArbitratorDependencyFactory* g_dependency_factory_for_test = NULL; | 14 GeolocationArbitratorDependencyFactory* g_dependency_factory_for_test = NULL; |
| 16 | 15 |
| 17 } // namespace | 16 } // namespace |
| 18 | 17 |
| 19 // To avoid oscillations, set this to twice the expected update interval of a | 18 // To avoid oscillations, set this to twice the expected update interval of a |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 } | 153 } |
| 155 | 154 |
| 156 bool GeolocationArbitrator::HasPermissionBeenGranted() const { | 155 bool GeolocationArbitrator::HasPermissionBeenGranted() const { |
| 157 return most_recent_authorized_frame_.is_valid(); | 156 return most_recent_authorized_frame_.is_valid(); |
| 158 } | 157 } |
| 159 | 158 |
| 160 void GeolocationArbitrator::SetDependencyFactoryForTest( | 159 void GeolocationArbitrator::SetDependencyFactoryForTest( |
| 161 GeolocationArbitratorDependencyFactory* dependency_factory) { | 160 GeolocationArbitratorDependencyFactory* dependency_factory) { |
| 162 g_dependency_factory_for_test = dependency_factory; | 161 g_dependency_factory_for_test = dependency_factory; |
| 163 } | 162 } |
| OLD | NEW |