From 334e51bc2ff9bf7fc55fa67dc8a6d9257501a32e Mon Sep 17 00:00:00 2001 From: Leon Scroggins Date: Fri, 11 Dec 2009 15:12:12 -0500 Subject: Provide localized strings for labels. Fix for http://b/issue?id=2178786 Call up to Java to get strings for labels, and use them on inputs. Requires a change in frameworks/base. --- WebKit/android/jni/WebCoreFrameBridge.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'WebKit/android/jni/WebCoreFrameBridge.h') 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 #include @@ -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; -- cgit v1.1