StaticTabSceneLayer owns ToolbarLayer

chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/Layout.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/Layout.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/Layout.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/Layout.java
index 6fa509282faa75ce1b629ab3413a342a9ca52aaa..0266a941f5401a17c1af04faee530d48e8061dd1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/Layout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/Layout.java
@@ -637,15 +637,6 @@ public abstract class Layout implements TabContentManager.ThumbnailChangeListene
     }
 
     /**
-     * @param currentOffset The current top controls offset in dp.
-     * @return {@link Float#NaN} if no offset should be used, or a value in dp if the top controls
-     *         offset should be overridden.
-     */
-    public float getTopControlsOffset(float currentOffset) {
-        return Float.NaN;
-    }
-
-    /**
      * Initializes a {@link LayoutTab} with data from the {@link LayoutUpdateHost}. This function
      * eventually needs to be called but may be overridden to manage the posting traffic.
      *
@@ -1172,8 +1163,6 @@ public abstract class Layout implements TabContentManager.ThumbnailChangeListene
         float offsetPx = fullscreenManager != null ? fullscreenManager.getControlOffset() : 0.f;
         float dpToPx = getContext().getResources().getDisplayMetrics().density;
         float offsetDp = offsetPx / dpToPx;
-        float offsetOverride = getTopControlsOffset(offsetDp);
-        if (!Float.isNaN(offsetOverride)) offsetDp = offsetOverride;
 
         SceneLayer content = getSceneLayer();
         for (int i = 0; i < mSceneOverlays.size(); i++) {
@@ -1199,13 +1188,6 @@ public abstract class Layout implements TabContentManager.ThumbnailChangeListene
     }
 
     /**
-     * @return The toolbar brightness.
-     */
-    public float getToolbarBrightness() {
-        return 1.0f;
-    }
-
-    /**
      * @return Whether the tabstrip's event filter is enabled.
      */
     public boolean isTabStripEventFilterEnabled() {