| Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| index 88785c177e4d7083df2badb0f07f756141072d1b..842aee940a9c4fde6a3454448c457e1f69647da1 100644
|
| --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| @@ -3044,15 +3044,20 @@ import java.util.Map;
|
| */
|
| public NavigationHistory getNavigationHistory() {
|
| NavigationHistory history = new NavigationHistory();
|
| - int currentIndex = nativeGetNavigationHistory(mNativeContentViewCore, history);
|
| - history.setCurrentEntryIndex(currentIndex);
|
| + if (mNativeContentViewCore != 0) {
|
| + int currentIndex = nativeGetNavigationHistory(mNativeContentViewCore, history);
|
| + history.setCurrentEntryIndex(currentIndex);
|
| + }
|
| return history;
|
| }
|
|
|
| @Override
|
| public NavigationHistory getDirectedNavigationHistory(boolean isForward, int itemLimit) {
|
| NavigationHistory history = new NavigationHistory();
|
| - nativeGetDirectedNavigationHistory(mNativeContentViewCore, history, isForward, itemLimit);
|
| + if (mNativeContentViewCore != 0) {
|
| + nativeGetDirectedNavigationHistory(
|
| + mNativeContentViewCore, history, isForward, itemLimit);
|
| + }
|
| return history;
|
| }
|
|
|
| @@ -3061,7 +3066,10 @@ import java.util.Map;
|
| * current entry.
|
| */
|
| public String getOriginalUrlForActiveNavigationEntry() {
|
| - return nativeGetOriginalUrlForActiveNavigationEntry(mNativeContentViewCore);
|
| + if (mNativeContentViewCore != 0) {
|
| + return nativeGetOriginalUrlForActiveNavigationEntry(mNativeContentViewCore);
|
| + }
|
| + return "";
|
| }
|
|
|
| /**
|
|
|