| 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 #ifndef CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PROVIDER_H_ | 5 #ifndef CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PROVIDER_H_ | 
| 6 #define CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PROVIDER_H_ | 6 #define CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PROVIDER_H_ | 
| 7 #pragma once | 7 #pragma once | 
| 8 | 8 | 
| 9 #include <map> | 9 #include <map> | 
| 10 | 10 | 
| 11 #include "base/thread.h" | 11 #include "base/threading/thread.h" | 
| 12 #include "chrome/browser/geolocation/geolocation_observer.h" | 12 #include "chrome/browser/geolocation/geolocation_observer.h" | 
| 13 #include "chrome/common/geoposition.h" | 13 #include "chrome/common/geoposition.h" | 
| 14 #include "googleurl/src/gurl.h" | 14 #include "googleurl/src/gurl.h" | 
| 15 | 15 | 
| 16 class GeolocationArbitrator; | 16 class GeolocationArbitrator; | 
| 17 | 17 | 
| 18 template<typename Type> | 18 template<typename Type> | 
| 19 struct DefaultSingletonTraits; | 19 struct DefaultSingletonTraits; | 
| 20 | 20 | 
| 21 // This is the main API to the geolocaiton subsystem. The application | 21 // This is the main API to the geolocaiton subsystem. The application | 
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 78   GURL most_recent_authorized_frame_; | 78   GURL most_recent_authorized_frame_; | 
| 79   Geoposition position_; | 79   Geoposition position_; | 
| 80 | 80 | 
| 81   // Only to be used on the geolocation thread. | 81   // Only to be used on the geolocation thread. | 
| 82   GeolocationArbitrator* arbitrator_; | 82   GeolocationArbitrator* arbitrator_; | 
| 83 | 83 | 
| 84   DISALLOW_COPY_AND_ASSIGN(GeolocationProvider); | 84   DISALLOW_COPY_AND_ASSIGN(GeolocationProvider); | 
| 85 }; | 85 }; | 
| 86 | 86 | 
| 87 #endif  // CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PROVIDER_H_ | 87 #endif  // CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PROVIDER_H_ | 
| OLD | NEW | 
|---|