am ba9f5f3f: Merge change 22440 into eclair

Merge commit 'ba9f5f3f6b0e499708fb9aa05f30f4a2e7d8b616' into eclair-plus-aosp

* commit 'ba9f5f3f6b0e499708fb9aa05f30f4a2e7d8b616':
  Java-side changes to persist Geolocation permissions between browser sessions.
This commit is contained in:
Steve Block
2009-08-24 10:57:54 -07:00
committed by Android Git Automerger

View File

@@ -172,6 +172,7 @@ public class WebSettings {
private long mAppCacheMaxSize = Long.MAX_VALUE; private long mAppCacheMaxSize = Long.MAX_VALUE;
private String mAppCachePath = ""; private String mAppCachePath = "";
private String mDatabasePath = ""; private String mDatabasePath = "";
private String mGeolocationDatabasePath = "";
// Don't need to synchronize the get/set methods as they // Don't need to synchronize the get/set methods as they
// are basic types, also none of these values are used in // are basic types, also none of these values are used in
// native WebCore code. // native WebCore code.
@@ -977,6 +978,21 @@ public class WebSettings {
} }
} }
/**
* Set the path where the Geolocation permissions database should be saved.
* This will update WebCore when the Sync runs in the C++ side.
* @param databasePath String path to the directory where the Geolocation
* permissions database should be saved. May be the empty string but
* should never be null.
* @hide pending api council approval
*/
public synchronized void setGeolocationDatabasePath(String databasePath) {
if (databasePath != null && !databasePath.equals(mDatabasePath)) {
mGeolocationDatabasePath = databasePath;
postSync();
}
}
/** /**
* Tell the WebView to enable Application Caches API. * Tell the WebView to enable Application Caches API.
* @param flag True if the WebView should enable Application Caches. * @param flag True if the WebView should enable Application Caches.