Upstream version 9.37.193.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / browser / runtime_resource_dispatcher_host_delegate_android.h

diff --git a/src/xwalk/runtime/browser/runtime_resource_dispatcher_host_delegate_android.h b/src/xwalk/runtime/browser/runtime_resource_dispatcher_host_delegate_android.h
index 0b517f2..2c20fbe 100644 (file)
--- a/src/xwalk/runtime/browser/runtime_resource_dispatcher_host_delegate_android.h
+++ b/src/xwalk/runtime/browser/runtime_resource_dispatcher_host_delegate_android.h
@@ -56,7 +56,8 @@ class RuntimeResourceDispatcherHostDelegateAndroid
   virtual bool HandleExternalProtocol(
       const GURL& url,
       int child_id,
-      int route_id) OVERRIDE;
+      int route_id,
+      bool initiated_by_user_gesture) OVERRIDE;
   virtual void OnResponseStarted(
       net::URLRequest* request,
       content::ResourceContext* resource_context,
@@ -65,21 +66,23 @@ class RuntimeResourceDispatcherHostDelegateAndroid
 
   void RemovePendingThrottleOnIoThread(IoThreadClientThrottle* throttle);
 
-  static void OnIoThreadClientReady(int new_child_id, int new_route_id);
-  static void AddPendingThrottle(int child_id,
-                                 int route_id,
+  static void OnIoThreadClientReady(int new_render_process_id,
+                                    int new_render_frame_id);
+  static void AddPendingThrottle(int render_process_id,
+                                 int render_frame_id,
                                  IoThreadClientThrottle* pending_throttle);
  private:
   friend struct base::DefaultLazyInstanceTraits<
       RuntimeResourceDispatcherHostDelegateAndroid>;
   // These methods must be called on IO thread.
-  void OnIoThreadClientReadyInternal(int child_id, int route_id);
-  void AddPendingThrottleOnIoThread(int child_id,
-                                    int route_id,
+  void OnIoThreadClientReadyInternal(int new_render_process_id,
+                                     int new_render_frame_id);
+  void AddPendingThrottleOnIoThread(int render_process_id,
+                                    int render_frame_id,
                                     IoThreadClientThrottle* pending_throttle);
 
-  typedef std::pair<int, int> ChildRouteIDPair;
-  typedef std::map<ChildRouteIDPair, IoThreadClientThrottle*>
+  typedef std::pair<int, int> FrameRouteIDPair;
+  typedef std::map<FrameRouteIDPair, IoThreadClientThrottle*>
       PendingThrottleMap;
 
   // Only accessed on the IO thread.