| Index: content/browser/geolocation/location_api_adapter_android.h
 | 
| diff --git a/content/browser/geolocation/location_api_adapter_android.h b/content/browser/geolocation/location_api_adapter_android.h
 | 
| new file mode 100644
 | 
| index 0000000000000000000000000000000000000000..6e48109a090003c6a4cf10410715b1583466414a
 | 
| --- /dev/null
 | 
| +++ b/content/browser/geolocation/location_api_adapter_android.h
 | 
| @@ -0,0 +1,85 @@
 | 
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 | 
| +// Use of this source code is governed by a BSD-style license that can be
 | 
| +// found in the LICENSE file.
 | 
| +
 | 
| +#ifndef CONTENT_BROWSER_GEOLOCATION_LOCATION_API_ADAPTER_ANDROID_H_
 | 
| +#define CONTENT_BROWSER_GEOLOCATION_LOCATION_API_ADAPTER_ANDROID_H_
 | 
| +
 | 
| +#include "base/android/jni_weak_ref.h"
 | 
| +#include "base/android/scoped_java_ref.h"
 | 
| +#include "base/memory/ref_counted.h"
 | 
| +#include "base/memory/singleton.h"
 | 
| +#include "base/synchronization/lock.h"
 | 
| +
 | 
| +namespace base {
 | 
| +class SingleThreadTaskRunner;
 | 
| +}
 | 
| +
 | 
| +namespace content {
 | 
| +class LocationProviderAndroid;
 | 
| +struct Geoposition;
 | 
| +
 | 
| +// Interacts with JNI and reports back to LocationProviderAndroid. This class
 | 
| +// creates a LocationProvider java object and listens for updates.
 | 
| +// The simplified flow is:
 | 
| +//   - GeolocationProvider runs in a Geolocation Thread and fetches geolocation
 | 
| +//     data from a LocationProvider.
 | 
| +//   - LocationProviderAndroid accesses a singleton AndroidLocationApiAdapter.
 | 
| +//   - AndroidLocationApiAdapter calls via JNI and uses the main thread Looper
 | 
| +//     in the java side to listen for location updates. We then bounce these
 | 
| +//     updates to the Geolocation thread.
 | 
| +//
 | 
| +// Note that AndroidLocationApiAdapter is a singleton and there's at most only
 | 
| +// one LocationProviderAndroid that has called Start().
 | 
| +class AndroidLocationApiAdapter {
 | 
| + public:
 | 
| +  // Starts the underlying location provider, returns true if successful.
 | 
| +  // Called on the Geolocation thread.
 | 
| +  bool Start(LocationProviderAndroid* location_provider, bool high_accuracy);
 | 
| +  // Stops the underlying location provider.
 | 
| +  // Called on the Geolocation thread.
 | 
| +  void Stop();
 | 
| +
 | 
| +  // Returns our singleton.
 | 
| +  static AndroidLocationApiAdapter* GetInstance();
 | 
| +
 | 
| +  // Called when initializing chrome_view to obtain a pointer to the java class.
 | 
| +  static bool RegisterGeolocationService(JNIEnv* env);
 | 
| +
 | 
| +  // Called by JNI on main thread looper.
 | 
| +  static void OnNewLocationAvailable(double latitude,
 | 
| +                                     double longitude,
 | 
| +                                     double time_stamp,
 | 
| +                                     bool has_altitude, double altitude,
 | 
| +                                     bool has_accuracy, double accuracy,
 | 
| +                                     bool has_heading, double heading,
 | 
| +                                     bool has_speed, double speed);
 | 
| +  static void OnNewErrorAvailable(JNIEnv* env, jstring message);
 | 
| +
 | 
| + private:
 | 
| +  friend struct base::DefaultSingletonTraits<AndroidLocationApiAdapter>;
 | 
| +  AndroidLocationApiAdapter();
 | 
| +  ~AndroidLocationApiAdapter();
 | 
| +
 | 
| +  void CreateJavaObject(JNIEnv* env);
 | 
| +
 | 
| +  // Called on the JNI main thread looper.
 | 
| +  void OnNewGeopositionInternal(const Geoposition& geoposition);
 | 
| +
 | 
| +  /// Called on the Geolocation thread.
 | 
| +  static void NotifyProviderNewGeoposition(const Geoposition& geoposition);
 | 
| +
 | 
| +  base::android::ScopedJavaGlobalRef<jobject>
 | 
| +      java_location_provider_android_object_;
 | 
| +  // TODO(mvanouwerkerk): Use a callback instead of holding a pointer.
 | 
| +  LocationProviderAndroid* location_provider_;  // Owned by the arbitrator.
 | 
| +
 | 
| +  // Guards against the following member which is accessed on Geolocation
 | 
| +  // thread and the JNI main thread looper.
 | 
| +  base::Lock lock_;
 | 
| +  scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 | 
| +};
 | 
| +
 | 
| +}  // namespace content
 | 
| +
 | 
| +#endif  // CONTENT_BROWSER_GEOLOCATION_LOCATION_API_ADAPTER_ANDROID_H_
 | 
| 
 |