| 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 cf404ccede7786d7b841e99bbf716a4cc07ae6d7..45f6f8719ee76dd9984c0f4e0de72f83d035b204 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
|
| @@ -615,13 +615,11 @@ public class ContentViewCore
|
| }
|
| };
|
|
|
| - long windowNativePointer = windowAndroid != null ? windowAndroid.getNativePointer() : 0;
|
| -
|
| - long viewAndroidNativePointer = 0;
|
| - if (windowNativePointer != 0) {
|
| - mViewAndroid = new ViewAndroid(windowAndroid, getViewAndroidDelegate());
|
| - viewAndroidNativePointer = mViewAndroid.getNativePointer();
|
| - }
|
| + long windowNativePointer = windowAndroid.getNativePointer();
|
| + assert windowNativePointer != 0;
|
| + mViewAndroid = new ViewAndroid(windowAndroid, getViewAndroidDelegate());
|
| + long viewAndroidNativePointer = mViewAndroid.getNativePointer();
|
| + assert viewAndroidNativePointer != 0;
|
|
|
| mZoomControlsDelegate = new ZoomControlsDelegate() {
|
| @Override
|
|
|