Commit 172d35b3 authored by mdjones's avatar mdjones Committed by Commit bot

Check fullscreen manager before setting control state

The fullscreen manager can be null in cases where a different
activity is showing. This CL adds a check to make sure it is there
before using it.

BUG=672730, 670459

Review-Url: https://codereview.chromium.org/2557403004
Cr-Commit-Position: refs/heads/master@{#437578}
parent 51736f81
...@@ -256,8 +256,10 @@ public abstract class LayoutManager implements LayoutUpdateHost, LayoutProvider, ...@@ -256,8 +256,10 @@ public abstract class LayoutManager implements LayoutUpdateHost, LayoutProvider,
TabContentManager tabContentManager, ResourceManager resourceManager, TabContentManager tabContentManager, ResourceManager resourceManager,
ChromeFullscreenManager fullscreenManager) { ChromeFullscreenManager fullscreenManager) {
// Update the android browser controls state. // Update the android browser controls state.
fullscreenManager.setHideBrowserControlsAndroidView( if (fullscreenManager != null) {
mActiveLayout.forceHideBrowserControlsAndroidView()); fullscreenManager.setHideBrowserControlsAndroidView(
mActiveLayout.forceHideBrowserControlsAndroidView());
}
getViewportPixel(mCachedVisibleViewport); getViewportPixel(mCachedVisibleViewport);
mHost.getWindowViewport(mCachedWindowViewport); mHost.getWindowViewport(mCachedWindowViewport);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment