diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-07-25 17:48:02 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-07-25 17:48:02 -0700 |
| commit | 9affe0ab6ef3bb4844d816fad644313cea9a9023 (patch) | |
| tree | bed7d10716109e7ac19386813ba77c558e38faa2 /WebKit/android/jni/JavaSharedClient.cpp | |
| parent | 3199981a0522022c71eb4e5a656f254b722d9713 (diff) | |
| parent | b116c1a08412db8a748998c7e8a2ce851cbacacd (diff) | |
| download | external_webkit-9affe0ab6ef3bb4844d816fad644313cea9a9023.zip external_webkit-9affe0ab6ef3bb4844d816fad644313cea9a9023.tar.gz external_webkit-9affe0ab6ef3bb4844d816fad644313cea9a9023.tar.bz2 | |
Merge korg/donut into korg/master
Diffstat (limited to 'WebKit/android/jni/JavaSharedClient.cpp')
| -rw-r--r-- | WebKit/android/jni/JavaSharedClient.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/WebKit/android/jni/JavaSharedClient.cpp b/WebKit/android/jni/JavaSharedClient.cpp index f115f62..bf52ecd 100644 --- a/WebKit/android/jni/JavaSharedClient.cpp +++ b/WebKit/android/jni/JavaSharedClient.cpp @@ -45,6 +45,12 @@ namespace android { return gCookieClient; } + KeyGeneratorClient* JavaSharedClient::GetKeyGeneratorClient() + { + //LOG_ASSERT(gKeyGeneratorClient != NULL, "gKeyGeneratorClient not initialized!!!"); + return gKeyGeneratorClient; + } + void JavaSharedClient::SetTimerClient(TimerClient* client) { //LOG_ASSERT(gTimerClient == NULL || client == NULL, "gTimerClient already set, aborting..."); @@ -57,8 +63,15 @@ namespace android { gCookieClient = client; } + void JavaSharedClient::SetKeyGeneratorClient(KeyGeneratorClient* client) + { + //LOG_ASSERT(gKeyGeneratorClient == NULL || client == NULL, "gKeyGeneratorClient already set, aborting..."); + gKeyGeneratorClient = client; + } + TimerClient* JavaSharedClient::gTimerClient = NULL; CookieClient* JavaSharedClient::gCookieClient = NULL; + KeyGeneratorClient* JavaSharedClient::gKeyGeneratorClient = NULL; /////////////////////////////////////////////////////////////////////////// |