Upstream version 6.35.131.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / renderer / xwalk_content_renderer_client.h

diff --git a/src/xwalk/runtime/renderer/xwalk_content_renderer_client.h b/src/xwalk/runtime/renderer/xwalk_content_renderer_client.h
index 1fdb425..609ff18 100644 (file)
--- a/src/xwalk/runtime/renderer/xwalk_content_renderer_client.h
+++ b/src/xwalk/runtime/renderer/xwalk_content_renderer_client.h
@@ -5,11 +5,24 @@
 #ifndef XWALK_RUNTIME_RENDERER_XWALK_CONTENT_RENDERER_CLIENT_H_
 #define XWALK_RUNTIME_RENDERER_XWALK_CONTENT_RENDERER_CLIENT_H_
 
+#include <string>
+
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/platform_file.h"
+#include "base/strings/string16.h"
+#include "content/public/common/page_transition_types.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "xwalk/extensions/renderer/xwalk_extension_renderer_controller.h"
+#if defined(OS_ANDROID)
+#include "xwalk/runtime/renderer/android/xwalk_render_process_observer.h"
+#else
+#include "xwalk/runtime/renderer/xwalk_render_process_observer_generic.h"
+#endif
+
+namespace visitedlink {
+class VisitedLinkSlave;
+}
 
 namespace xwalk {
 
@@ -33,9 +46,17 @@ class XWalkContentRendererClient
   virtual void DidCreateScriptContext(
       blink::WebFrame* frame, v8::Handle<v8::Context> context,
       int extension_group, int world_id) OVERRIDE;
-  virtual void WillReleaseScriptContext(blink::WebFrame* frame,
-                                        v8::Handle<v8::Context>,
-                                        int world_id) OVERRIDE;
+#if defined(OS_ANDROID)
+  virtual unsigned long long VisitedLinkHash(const char* canonical_url, // NOLINT
+                                             size_t length) OVERRIDE;
+  virtual bool IsLinkVisited(unsigned long long link_hash) OVERRIDE; // NOLINT
+#endif
+
+  virtual bool WillSendRequest(blink::WebFrame* frame,
+                               content::PageTransition transition_type,
+                               const GURL& url,
+                               const GURL& first_party_for_cookies,
+                               GURL* new_url) OVERRIDE;
 
  private:
   // XWalkExtensionRendererController::Delegate implementation.
@@ -45,10 +66,19 @@ class XWalkContentRendererClient
   scoped_ptr<extensions::XWalkExtensionRendererController>
       extension_controller_;
 
-#if defined(OS_ANDROID)
   scoped_ptr<XWalkRenderProcessObserver> xwalk_render_process_observer_;
+#if defined(OS_ANDROID)
+  scoped_ptr<visitedlink::VisitedLinkSlave> visited_link_slave_;
 #endif
 
+  void GetNavigationErrorStrings(
+      content::RenderView* render_view,
+      blink::WebFrame* frame,
+      const blink::WebURLRequest& failed_request,
+      const blink::WebURLError& error,
+      std::string* error_html,
+      base::string16* error_description) OVERRIDE;
+
   DISALLOW_COPY_AND_ASSIGN(XWalkContentRendererClient);
 };