diff options
| author | Leon Scroggins <scroggo@google.com> | 2009-12-15 05:56:14 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-15 05:56:14 -0800 |
| commit | 33cbb13803ce37ab3306b7ba46d2cc4a86cb9193 (patch) | |
| tree | 2178fd95aa4eea6732de9881e9348edee3cfb22a /WebKit/android/jni/WebCoreFrameBridge.h | |
| parent | 27fe1be0694fb6b93e68f2c660707bf547f11448 (diff) | |
| parent | 334e51bc2ff9bf7fc55fa67dc8a6d9257501a32e (diff) | |
| download | external_webkit-33cbb13803ce37ab3306b7ba46d2cc4a86cb9193.zip external_webkit-33cbb13803ce37ab3306b7ba46d2cc4a86cb9193.tar.gz external_webkit-33cbb13803ce37ab3306b7ba46d2cc4a86cb9193.tar.bz2 | |
am 334e51bc: Provide localized strings for <input> labels.
Merge commit '334e51bc2ff9bf7fc55fa67dc8a6d9257501a32e' into eclair-mr2-plus-aosp
* commit '334e51bc2ff9bf7fc55fa67dc8a6d9257501a32e':
Provide localized strings for <input> labels.
Diffstat (limited to 'WebKit/android/jni/WebCoreFrameBridge.h')
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.h b/WebKit/android/jni/WebCoreFrameBridge.h index 7d18c40..657ebf1 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.h +++ b/WebKit/android/jni/WebCoreFrameBridge.h @@ -29,7 +29,7 @@ #define WEBFRAME_H #include "FrameLoaderClient.h" -#include "PlatformString.h" +#include "PlatformBridge.h" #include "WebCoreRefObject.h" #include <jni.h> #include <wtf/RefCounted.h> @@ -51,12 +51,6 @@ class WebViewCore; // one instance of WebFrame per Page for calling into Java's BrowserFrame class WebFrame : public WebCoreRefObject { public: - // these ids need to be in sync with the constants in BrowserFrame.java - enum RAW_RES_ID { - NODOMAIN = 1, - LOADERROR, - DRAWABLEDIR, - }; WebFrame(JNIEnv* env, jobject obj, jobject historyList, WebCore::Page* page); ~WebFrame(); @@ -108,7 +102,7 @@ class WebFrame : public WebCoreRefObject { void setUserAgent(WebCore::String userAgent) { mUserAgent = userAgent; } - WebCore::String getRawResourceFilename(RAW_RES_ID) const; + WebCore::String getRawResourceFilename(WebCore::PlatformBridge::rawResId) const; float density() const; |