Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / shell / android / shell_apk / src / org / chromium / content_shell_apk / ContentShellActivity.java

diff --git a/src/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java b/src/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
index 4e5edbc..1acea20 100644 (file)
--- a/src/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
+++ b/src/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
@@ -126,7 +126,7 @@ public class ContentShellActivity extends Activity {
         super.onSaveInstanceState(outState);
         ContentViewCore contentViewCore = getActiveContentViewCore();
         if (contentViewCore != null) {
-            outState.putString(ACTIVE_SHELL_URL_KEY, contentViewCore.getUrl());
+            outState.putString(ACTIVE_SHELL_URL_KEY, contentViewCore.getWebContents().getUrl());
         }
 
         mWindowAndroid.saveInstanceState(outState);
@@ -144,8 +144,9 @@ public class ContentShellActivity extends Activity {
     public boolean onKeyUp(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK) {
             ContentViewCore contentViewCore = getActiveContentViewCore();
-            if (contentViewCore != null && contentViewCore.canGoBack()) {
-                contentViewCore.goBack();
+            if (contentViewCore != null && contentViewCore.getWebContents()
+                    .getNavigationController().canGoBack()) {
+                contentViewCore.getWebContents().getNavigationController().goBack();
                 return true;
             }
         }