diff options
author | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-23 21:31:43 +0000 |
---|---|---|
committer | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-23 21:31:43 +0000 |
commit | 072beb5d460fb5902ce166b454373c415b3286f9 (patch) | |
tree | b55aeba52e37fca7e5ee0d8f31db522d802c5a6e | |
parent | e95d17c08a2ebd04d6348abd33147d48e4b2a36f (diff) | |
download | chromium_src-072beb5d460fb5902ce166b454373c415b3286f9.zip chromium_src-072beb5d460fb5902ce166b454373c415b3286f9.tar.gz chromium_src-072beb5d460fb5902ce166b454373c415b3286f9.tar.bz2 |
Merge 285043 "Always use the legacy GeolocationPermission APIs"
> Always use the legacy GeolocationPermission APIs
>
> BUG=396184
> NOTRY=true
>
> Review URL: https://codereview.chromium.org/410703003
TBR=michaelbai@chromium.org
Review URL: https://codereview.chromium.org/415803003
git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@285046 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | android_webview/java/src/org/chromium/android_webview/AwContents.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java index 21e5613..30a741e 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java @@ -2369,8 +2369,10 @@ public class AwContents { // Return true if the GeolocationPermissionAPI should be used. @CalledByNative private boolean useLegacyGeolocationPermissionAPI() { - // TODO (michaelbai): Need to verify whether this is correct when release. - return mContext.getApplicationInfo().targetSdkVersion <= Build.VERSION_CODES.KITKAT; + // Always return true since we are not ready to swap the geolocation yet. + // TODO: If we decide not to migrate the geolocation, there are some unreachable + // code need to remove. http://crbug.com/396184. + return true; } //-------------------------------------------------------------------------------------------- |