Revert r11118 :(

TBR=dglazkov

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

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

3 files changed, 14 insertions, 15 deletions

diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index 22b2775..9508c50 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -22,6 +22,7 @@
 #include "chrome/renderer/render_process.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
+#include "chrome/renderer/visitedlink_slave.h"
 #include "googleurl/src/url_util.h"
 #include "webkit/glue/scoped_clipboard_writer_glue.h"
 #include "webkit/glue/webframe.h"
@@ -177,6 +178,10 @@ std::string GetDataResource(int resource_id) {
   return ResourceBundle::GetSharedInstance().GetDataResource(resource_id);
 }
 
+SkBitmap* GetBitmapResource(int resource_id) {
+  return ResourceBundle::GetSharedInstance().GetBitmapNamed(resource_id);
+}
+
 #if defined(OS_WIN)
 HCURSOR LoadCursor(int cursor_id) {
   return ResourceBundle::GetSharedInstance().LoadCursor(cursor_id);
@@ -246,6 +251,15 @@ webkit_glue::ScreenInfo GetScreenInfo(gfx::NativeViewId window) {
   return results;
 }
 
+uint64 VisitedLinkHash(const char* canonical_url, size_t length) {
+  return RenderThread::current()->visited_link_slave()->ComputeURLFingerprint(
+      canonical_url, length);
+}
+
+bool IsLinkVisited(uint64 link_hash) {
+  return RenderThread::current()->visited_link_slave()->IsVisited(link_hash);
+}
+
 #ifndef USING_SIMPLE_RESOURCE_LOADER_BRIDGE
 
 // Each RenderView has a ResourceDispatcher.  In unit tests, this function may
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 286d227..7a065f9 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -13,7 +13,6 @@
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/renderer/net/render_dns_master.h"
 #include "chrome/renderer/render_thread.h"
-#include "chrome/renderer/visitedlink_slave.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webkit_glue.h"
 
@@ -22,18 +21,6 @@ using WebKit::WebURL;
 
 //------------------------------------------------------------------------------
 
-uint64_t RendererWebKitClientImpl::visitedLinkHash(const char* canonical_url,
-                                                   size_t length) {
-  return RenderThread::current()->visited_link_slave()->ComputeURLFingerprint(
-      canonical_url, length);
-}
-
-bool RendererWebKitClientImpl::isLinkVisited(uint64_t link_hash) {
-  return RenderThread::current()->visited_link_slave()->IsVisited(link_hash);
-}
-
-//------------------------------------------------------------------------------
-
 void RendererWebKitClientImpl::setCookies(
     const WebURL& url, const WebURL& policy_url, const WebString& value) {
   std::string value_utf8;
diff --git a/chrome/renderer/renderer_webkitclient_impl.h b/chrome/renderer/renderer_webkitclient_impl.h
index 2ed397b..9a7fe1d 100644
--- a/chrome/renderer/renderer_webkitclient_impl.h
+++ b/chrome/renderer/renderer_webkitclient_impl.h
@@ -14,8 +14,6 @@ class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl {
   virtual WebKit::WebMimeRegistry* mimeRegistry() {
     return &mime_registry_;
   }
-  virtual uint64_t visitedLinkHash(const char* canonicalURL, size_t length);
-  virtual bool isLinkVisited(uint64_t linkHash);
   virtual void setCookies(
       const WebKit::WebURL& url, const WebKit::WebURL& policy_url,
       const WebKit::WebString&);