diff options
| author | cramya@chromium.org <cramya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-27 00:49:37 +0000 |
|---|---|---|
| committer | cramya@chromium.org <cramya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-27 00:49:37 +0000 |
| commit | cb2322e2bf590f64bd8dee08b418477138d51ae4 (patch) | |
| tree | 91e12e9f3a58a7b47bc33e7af68291f7c7b1943a /base/android | |
| parent | e5656ec4577ae074bd6b45c3fc715776b3f2c6f7 (diff) | |
| download | chromium_src-cb2322e2bf590f64bd8dee08b418477138d51ae4.zip chromium_src-cb2322e2bf590f64bd8dee08b418477138d51ae4.tar.gz chromium_src-cb2322e2bf590f64bd8dee08b418477138d51ae4.tar.bz2 | |
Add Google Location Settings geolocation permission flow
Pre MR0 version in Android, we had an explicit "Enable Location"
setting in Chrome that will show the infobar based on the
settings. Post MR0, we use the combination of system master
location setting and system google apps location setting to
decide between
1. Showing the infobar with Allow button (if both master and
google apps are turned on)
2. Showing the infobar with Settings button that will take user
to Google Apps Location Setting activity (if master is on but
google apps location setting is turned off)
3. Do not show infobar (if master is off)
Above functionality has been added in this CL for both pre and
post MR0 cases.
This CL also removes the android unit_test for GeolocationEnabledDisabled. Since the android specific geolocation code is going to be refactored, this test along with few more android specific unit_tests will be added in an upcoming CL.
CQ-DEPEND=0f28fce084f6010242360fb7b6633b8fd7296be4
Review URL: https://chromiumcodereview.appspot.com/11186010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164466 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/android')
| -rwxr-xr-x | base/android/jni_generator/jni_generator.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/base/android/jni_generator/jni_generator.py b/base/android/jni_generator/jni_generator.py index eec3e1a..85d8ce8 100755 --- a/base/android/jni_generator/jni_generator.py +++ b/base/android/jni_generator/jni_generator.py @@ -155,6 +155,7 @@ def JavaParamToJni(param): 'Landroid/graphics/SurfaceTexture', 'Lcom/google/android/apps/chrome/ChromeContextMenuInfo', 'Lcom/google/android/apps/chrome/ChromeWindow', + 'Lcom/google/android/apps/chrome/GoogleLocationSettingsHelperImpl', 'Lcom/google/android/apps/chrome/OmniboxSuggestion', 'Lcom/google/android/apps/chrome/PageInfoViewer', 'Lcom/google/android/apps/chrome/Tab', @@ -180,6 +181,8 @@ def JavaParamToJni(param): 'Lorg/chromium/chrome/browser/ChromeWebContentsDelegateAndroid', 'Lorg/chromium/chrome/browser/FindMatchRectsDetails', 'Lorg/chromium/chrome/browser/FindNotificationDetails', + 'Lorg/chromium/chrome/browser/GoogleLocationSettingsHelper', + 'Lorg/chromium/chrome/browser/GoogleLocationSettingsHelperStub', 'Lorg/chromium/chrome/browser/JavascriptAppModalDialog', 'Lorg/chromium/chrome/browser/ProcessUtils', ('Lorg/chromium/chrome/browser/component/navigation_interception/' |