Upstream version 9.38.204.0

[platform/framework/web/crosswalk.git] / src / xwalk / app / android / runtime_client / src / org / xwalk / app / runtime / extension / XWalkCoreExtensionBridge.java

diff --git a/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/extension/XWalkCoreExtensionBridge.java b/src/xwalk/app/android/runtime_client/src/org/xwalk/app/runtime/extension/XWalkCoreExtensionBridge.java
similarity index 78%
rename from src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/extension/XWalkCoreExtensionBridge.java
rename to src/xwalk/app/android/runtime_client/src/org/xwalk/app/runtime/extension/XWalkCoreExtensionBridge.java
index d5df5f9..5ec52f1 100644 (file)
--- a/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/extension/XWalkCoreExtensionBridge.java
+++ b/src/xwalk/app/android/runtime_client/src/org/xwalk/app/runtime/extension/XWalkCoreExtensionBridge.java
@@ -2,24 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.xwalk.core.internal.extension;
+package org.xwalk.app.runtime.extension;
 
 import android.content.Context;
 import android.content.Intent;
 
-import org.chromium.base.CalledByNative;
-
-import org.xwalk.core.internal.extensions.XWalkExtensionAndroid;
-import org.xwalk.core.internal.extension.XWalkExtension;
+import org.xwalk.core.XWalkExtension;
 
 /**
  * The extension bridge for the implementation based on xwalk core.
  */
-class XWalkCoreExtensionBridge extends XWalkExtensionAndroid implements XWalkExtensionBridge {
-    private XWalkExtension mExtension;
+class XWalkCoreExtensionBridge extends XWalkExtension implements XWalkRuntimeExtensionBridge {
+    private XWalkExtensionClient mExtension;
 
-    public XWalkCoreExtensionBridge(XWalkExtension extension) {
-        super(extension.getExtensionName(), extension.getJsApi(), extension.getEntryPoints());
+    public XWalkCoreExtensionBridge(XWalkExtensionClient extension) {
+        super(extension.getExtensionName(), extension.getJsApi(), null);
         mExtension = extension;
     }
 
@@ -36,7 +33,6 @@ class XWalkCoreExtensionBridge extends XWalkExtensionAndroid implements XWalkExt
 
     public void onDestroy() {
         mExtension.onDestroy();
-        destroyExtension();
     }
 
     public void onResume() {