Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1127)

Unified Diff: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

Issue 385643002: [Android] Clean up ViewAndroid and WindowAndroid checks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/android/content_view_core_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « content/browser/android/content_view_core_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698