Upstream version 8.36.161.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / android / core_shell / src / org / xwalk / core / xwview / shell / XWalkViewShellActivity.java

diff --git a/src/xwalk/runtime/android/core_shell/src/org/xwalk/core/xwview/shell/XWalkViewShellActivity.java b/src/xwalk/runtime/android/core_shell/src/org/xwalk/core/xwview/shell/XWalkViewShellActivity.java
index 06fa264..fd48538 100644 (file)
--- a/src/xwalk/runtime/android/core_shell/src/org/xwalk/core/xwview/shell/XWalkViewShellActivity.java
+++ b/src/xwalk/runtime/android/core_shell/src/org/xwalk/core/xwview/shell/XWalkViewShellActivity.java
@@ -40,7 +40,8 @@ import org.xwalk.core.XWalkNavigationHistory;
 import org.xwalk.core.XWalkPreferences;
 import org.xwalk.core.XWalkResourceClient;
 import org.xwalk.core.XWalkView;
-import org.xwalk.core.XWalkWebChromeClient;
+import org.xwalk.core.internal.XWalkViewInternal;
+import org.xwalk.core.internal.XWalkWebChromeClient;
 
 public class XWalkViewShellActivity extends FragmentActivity
         implements ActionBar.TabListener, XWalkViewSectionFragment.OnXWalkViewCreatedListener{
@@ -195,14 +196,6 @@ public class XWalkViewShellActivity extends FragmentActivity
     }
 
     @Override
-    public boolean onKeyUp(int keyCode, KeyEvent event) {
-        if (mActiveView != null) {
-            return mActiveView.onKeyUp(keyCode, event) || super.onKeyUp(keyCode, event);
-        }
-        return super.onKeyUp(keyCode, event);
-    }
-
-    @Override
     public void onNewIntent(Intent intent) {
         if (mActiveView != null) {
             if (!mActiveView.onNewIntent(intent)) super.onNewIntent(intent);
@@ -320,10 +313,11 @@ public class XWalkViewShellActivity extends FragmentActivity
             }
         });
 
+        // TODO: core shell shouldn't use internal APIs.
         xwalkView.setXWalkWebChromeClient(new XWalkWebChromeClient(xwalkView) {
             @Override
-            public void onReceivedTitle(XWalkView view, String title) {
-                mSectionsPagerAdapter.setPageTitle(view, title);
+            public void onReceivedTitle(XWalkViewInternal view, String title) {
+                mSectionsPagerAdapter.setPageTitle((XWalkView)view, title);
             }
         });
     }