| 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 "chrome/browser/geolocation/location_arbitrator.h" | 5 #include "chrome/browser/geolocation/location_arbitrator.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 | 8 |
| 9 #include "chrome/browser/geolocation/arbitrator_dependency_factory.h" | 9 #include "chrome/browser/geolocation/arbitrator_dependency_factory.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 } | 154 } |
| 155 | 155 |
| 156 bool GeolocationArbitrator::HasPermissionBeenGranted() const { | 156 bool GeolocationArbitrator::HasPermissionBeenGranted() const { |
| 157 return most_recent_authorized_frame_.is_valid(); | 157 return most_recent_authorized_frame_.is_valid(); |
| 158 } | 158 } |
| 159 | 159 |
| 160 void GeolocationArbitrator::SetDependencyFactoryForTest( | 160 void GeolocationArbitrator::SetDependencyFactoryForTest( |
| 161 GeolocationArbitratorDependencyFactory* dependency_factory) { | 161 GeolocationArbitratorDependencyFactory* dependency_factory) { |
| 162 g_dependency_factory_for_test = dependency_factory; | 162 g_dependency_factory_for_test = dependency_factory; |
| 163 } | 163 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 6597044:
Revert 76228 - Move core pieces of geolocation from chrome to content.This is... (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/