diff options
| author | Feng Qian <fqian@google.com> | 2009-06-18 14:00:49 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-18 14:00:49 -0700 |
| commit | c9c4d65c1547996ed3748026904d6e7f09aec2b4 (patch) | |
| tree | 5298ee7f87a0f97f06d5b2e66c37dedd88238ccf /WebKit/android/jni/JavaSharedClient.cpp | |
| parent | ad9f76210e4cbae75d762b7a65b39af424879b6b (diff) | |
| parent | 36747fa778285f57f2f53c047028be83e9d8776d (diff) | |
| download | external_webkit-c9c4d65c1547996ed3748026904d6e7f09aec2b4.zip external_webkit-c9c4d65c1547996ed3748026904d6e7f09aec2b4.tar.gz external_webkit-c9c4d65c1547996ed3748026904d6e7f09aec2b4.tar.bz2 | |
Merge commit 'goog/master' into webkit_merge
Resolved conflicts:
WebCore/Android.mk
WebCore/storage/LocalStorageArea.h
WebCore/storage/SessionStorageArea.cpp
WebCore/storage/StorageEvent.cpp
Diffstat (limited to 'WebKit/android/jni/JavaSharedClient.cpp')
| -rw-r--r-- | WebKit/android/jni/JavaSharedClient.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/WebKit/android/jni/JavaSharedClient.cpp b/WebKit/android/jni/JavaSharedClient.cpp index 3ddf726..2eec7b9 100644 --- a/WebKit/android/jni/JavaSharedClient.cpp +++ b/WebKit/android/jni/JavaSharedClient.cpp @@ -45,6 +45,11 @@ namespace android { return gPluginClient; } + KeyGeneratorClient* JavaSharedClient::GetKeyGeneratorClient() + { + return gKeyGeneratorClient; + } + void JavaSharedClient::SetTimerClient(TimerClient* client) { gTimerClient = client; @@ -60,9 +65,15 @@ namespace android { gPluginClient = client; } + void JavaSharedClient::SetKeyGeneratorClient(KeyGeneratorClient* client) + { + gKeyGeneratorClient = client; + } + TimerClient* JavaSharedClient::gTimerClient = NULL; CookieClient* JavaSharedClient::gCookieClient = NULL; PluginClient* JavaSharedClient::gPluginClient = NULL; + KeyGeneratorClient* JavaSharedClient::gKeyGeneratorClient = NULL; /////////////////////////////////////////////////////////////////////////// |