Upstream version 7.35.139.0

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

diff --git a/src/xwalk/runtime/browser/runtime.cc b/src/xwalk/runtime/browser/runtime.cc
index ecc84d2..86cf0a6 100644 (file)
--- a/src/xwalk/runtime/browser/runtime.cc
+++ b/src/xwalk/runtime/browser/runtime.cc
@@ -23,6 +23,7 @@
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
+#include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/browser/render_process_host.h"
 #include "grit/xwalk_resources.h"
@@ -155,8 +156,8 @@ void Runtime::Close() {
   delete this;
 }
 
-NativeAppWindow* Runtime::window() const {
-  return window_;
+content::RenderProcessHost* Runtime::GetRenderProcessHost() {
+  return web_contents_->GetRenderProcessHost();
 }
 
 //////////////////////////////////////////////////////
@@ -171,7 +172,8 @@ content::WebContents* Runtime::OpenURLFromTab(
   return source;
 }
 
-void Runtime::LoadingStateChanged(content::WebContents* source) {
+void Runtime::LoadingStateChanged(content::WebContents* source,
+                                  bool to_different_document) {
 }
 
 void Runtime::ToggleFullscreenModeForTab(content::WebContents* web_contents,
@@ -226,7 +228,7 @@ void Runtime::HandleKeyboardEvent(
 
 void Runtime::WebContentsCreated(
     content::WebContents* source_contents,
-    int64 source_frame_id,
+    int opener_render_frame_id,
     const base::string16& frame_name,
     const GURL& target_url,
     content::WebContents* new_contents) {
@@ -344,12 +346,6 @@ void Runtime::RequestMediaAccessPermission(
       web_contents, request, callback);
 }
 
-void Runtime::RenderProcessGone(base::TerminationStatus status) {
-  content::RenderProcessHost* rph = web_contents_->GetRenderProcessHost();
-  VLOG(1) << "RenderProcess id: " << rph->GetID() << " is gone!";
-  XWalkRunner::GetInstance()->OnRenderProcessHostGone(rph);
-}
-
 void Runtime::ApplyWindowDefaultParams(NativeAppWindow::CreateParams* params) {
   if (!params->delegate)
     params->delegate = this;