Introduce WebLocalizedString and queryLocalizedString methods

on WebKitClient.  This allows glue/localized_strings.cc to move
into the WebKit API implementation.

BUG=16933
TEST=none
R=dglazkov

Review URL: http://codereview.chromium.org/149760

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20938 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 24 insertions, 17 deletions

diff --git a/chrome/browser/renderer_host/render_sandbox_host_linux.cc b/chrome/browser/renderer_host/render_sandbox_host_linux.cc
index f2dd374..de68170d 100644
--- a/chrome/browser/renderer_host/render_sandbox_host_linux.cc
+++ b/chrome/browser/renderer_host/render_sandbox_host_linux.cc
@@ -30,6 +30,7 @@ using WebKit::WebClipboard;
 using WebKit::WebData;
 using WebKit::WebFontInfo;
 using WebKit::WebKitClient;
+using WebKit::WebLocalizedString;
 using WebKit::WebMimeRegistry;
 using WebKit::WebPluginInfo;
 using WebKit::WebPluginListBuilder;
@@ -106,6 +107,10 @@ class SandboxIPCProcess : public WebKitClient {
   virtual WebSandboxSupport* sandboxSupport() { return NULL; }
   virtual WebThemeEngine* themeEngine() { return NULL; }
 
+  virtual bool getFileSize(const WebString& path, long long& result) {
+    return false;
+  }
+
   virtual unsigned long long visitedLinkHash(const char*, size_t) { return 0; }
   virtual bool isLinkVisited(unsigned long long) { return false; }
 
@@ -114,10 +119,6 @@ class SandboxIPCProcess : public WebKitClient {
 
   virtual void prefetchHostName(const WebString&) { }
 
-  virtual bool getFileSize(const WebString& path, long long& result) {
-    return false;
-  }
-
   virtual WebURLLoader* createURLLoader() { return NULL; }
 
   virtual void getPluginList(bool refresh, WebPluginListBuilder*) { }
@@ -129,6 +130,12 @@ class SandboxIPCProcess : public WebKitClient {
   virtual void traceEventEnd(const char* name, void*, const char*) { }
 
   virtual WebData loadResource(const char*) { return WebData(); }
+  virtual WebString queryLocalizedString(WebLocalizedString::Name) {
+    return WebString();
+  }
+  virtual WebString queryLocalizedString(WebLocalizedString::Name, int) {
+    return WebString();
+  }
 
   virtual void suddenTerminationChanged(bool) { }
 
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 5662bfa..05e56fb 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -41,6 +41,18 @@ WebKit::WebSandboxSupport* RendererWebKitClientImpl::sandboxSupport() {
 #endif
 }
 
+bool RendererWebKitClientImpl::getFileSize(const WebString& path,
+                                           long long& result) {
+  if (RenderThread::current()->Send(new ViewHostMsg_GetFileSize(
+      FilePath(webkit_glue::WebStringToFilePathString(path)),
+      &result))) {
+    return result >= 0;
+  } else {
+    result = -1;
+    return false;
+  }
+}
+
 unsigned long long RendererWebKitClientImpl::visitedLinkHash(
     const char* canonical_url,
     size_t length) {
@@ -77,18 +89,6 @@ void RendererWebKitClientImpl::prefetchHostName(const WebString& hostname) {
   }
 }
 
-bool RendererWebKitClientImpl::getFileSize(const WebString& path,
-                                           long long& result) {
-  if (RenderThread::current()->Send(new ViewHostMsg_GetFileSize(
-      FilePath(webkit_glue::WebStringToFilePathString(path)),
-      &result))) {
-    return result >= 0;
-  } else {
-    result = -1;
-    return false;
-  }
-}
-
 WebString RendererWebKitClientImpl::defaultLocale() {
   // TODO(darin): Eliminate this webkit_glue call.
   return WideToUTF16(webkit_glue::GetWebKitLocale());
diff --git a/chrome/renderer/renderer_webkitclient_impl.h b/chrome/renderer/renderer_webkitclient_impl.h
index d6d9b33..3f4d5cf 100644
--- a/chrome/renderer/renderer_webkitclient_impl.h
+++ b/chrome/renderer/renderer_webkitclient_impl.h
@@ -24,6 +24,7 @@ class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl {
   virtual WebKit::WebClipboard* clipboard();
   virtual WebKit::WebMimeRegistry* mimeRegistry();
   virtual WebKit::WebSandboxSupport* sandboxSupport();
+  virtual bool getFileSize(const WebKit::WebString& path, long long& result);
   virtual unsigned long long visitedLinkHash(
       const char* canonicalURL, size_t length);
   virtual bool isLinkVisited(unsigned long long linkHash);
@@ -33,7 +34,6 @@ class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl {
   virtual WebKit::WebString cookies(
       const WebKit::WebURL& url, const WebKit::WebURL& first_party_for_cookies);
   virtual void prefetchHostName(const WebKit::WebString&);
-  virtual bool getFileSize(const WebKit::WebString& path, long long& result);
   virtual WebKit::WebString defaultLocale();
   virtual void suddenTerminationChanged(bool enabled);