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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ToolbarSceneLayer.java

Issue 2874323002: Check if tab is null before requesting theme color (Closed)
Patch Set: Created 3 years, 7 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/compositor/scene_layer/ToolbarSceneLayer.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ToolbarSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ToolbarSceneLayer.java
index 8335b4b870589348dc899e326ac40e0787f54d21..757c727a453027ef99f7ad88bf56d89fc2974efa 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ToolbarSceneLayer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ToolbarSceneLayer.java
@@ -149,9 +149,10 @@ public class ToolbarSceneLayer extends SceneOverlayLayer implements SceneOverlay
// TODO(mdjones): Create a "theme provider" to handle cases like this.
int color = mRenderHost.getBrowserControlsBackgroundColor();
float alpha = mRenderHost.getBrowserControlsUrlBarAlpha();
- if (mLayoutProvider.getFullscreenManager().areBrowserControlsAtBottom()) {
- color = mLayoutProvider.getFullscreenManager().getTab().getDefaultThemeColor();
- if (!mLayoutProvider.getFullscreenManager().getTab().isIncognito()) alpha = 1f;
+ ChromeFullscreenManager fullscreenManager = mLayoutProvider.getFullscreenManager();
+ if (fullscreenManager.areBrowserControlsAtBottom() && fullscreenManager.getTab() != null) {
+ color = fullscreenManager.getTab().getDefaultThemeColor();
+ if (!fullscreenManager.getTab().isIncognito()) alpha = 1f;
}
update(color, alpha, mLayoutProvider.getFullscreenManager(), resourceManager,
« 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