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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java

Issue 1035603002: Check nullity in FullscreenHtmlApiHandler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changed comment Created 5 years, 9 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java
index 344496951d0dcf50dcb8e0061ec91f1b6e71a7ca..66a6faed9dee468cc671bc3f0d95dc2fe6c527c3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java
@@ -270,7 +270,12 @@ public class FullscreenHtmlApiHandler {
}
};
contentView.addOnLayoutChangeListener(mFullscreenOnLayoutChangeListener);
- contentViewCore.getWebContents().exitFullscreen();
+
+ // getWebContents() will return null if contentViewCore has been destroyed
+ if (contentViewCore.getWebContents() != null) {
+ contentViewCore.getWebContents().exitFullscreen();
+ }
+
if (mFullscreenInfoBarDelegate != null) {
mFullscreenInfoBarDelegate.closeFullscreenInfoBar();
mFullscreenInfoBarDelegate = null;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698