[Home] Disable theme colors in toolbar

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

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 6361b5d5a49d631554c18e8063759b24ae4d6ff4..8335b4b870589348dc899e326ac40e0787f54d21 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
@@ -146,9 +146,16 @@ public class ToolbarSceneLayer extends SceneOverlayLayer implements SceneOverlay
                 mLayoutProvider.getActiveLayout().forceHideBrowserControlsAndroidView();
         ViewportMode viewportMode = mLayoutProvider.getActiveLayout().getViewportMode();
 
-        update(mRenderHost.getBrowserControlsBackgroundColor(),
-                mRenderHost.getBrowserControlsUrlBarAlpha(), mLayoutProvider.getFullscreenManager(),
-                resourceManager, forceHideBrowserControlsAndroidView, viewportMode,
+        // 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;
+        }
+
+        update(color, alpha, mLayoutProvider.getFullscreenManager(), resourceManager,
+                forceHideBrowserControlsAndroidView, viewportMode,
                 DeviceFormFactor.isTablet(mContext), viewport.height());
 
         return this;