StaticTabSceneLayer owns ToolbarLayer

chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java
index c5bd500c6e212dd43b235e372681942e53bbfb40..2d75db2560b5de588997f6f4709751ee76276a26 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java
@@ -336,25 +336,6 @@ public class CompositorView
                 && (flags & SizingFlags.ALLOW_TOOLBAR_ANIMATE) == 0) {
             useTexture = false;
         }
-
-        nativeUpdateToolbarLayer(mNativeCompositorView, R.id.control_container,
-                mRenderHost.getTopControlsBackgroundColor(), R.drawable.textbox,
-                mRenderHost.getTopControlsUrlBarAlpha(), offset,
-                provider.getActiveLayout().getToolbarBrightness(),
-                useTexture, forceHideTopControlsAndroidView);
-
-        if (progressBarDrawingInfo == null) return;
-        nativeUpdateProgressBar(mNativeCompositorView,
-                progressBarDrawingInfo.progressBarRect.left,
-                progressBarDrawingInfo.progressBarRect.top,
-                progressBarDrawingInfo.progressBarRect.width(),
-                progressBarDrawingInfo.progressBarRect.height(),
-                progressBarDrawingInfo.progressBarColor,
-                progressBarDrawingInfo.progressBarBackgroundRect.left,
-                progressBarDrawingInfo.progressBarBackgroundRect.top,
-                progressBarDrawingInfo.progressBarBackgroundRect.width(),
-                progressBarDrawingInfo.progressBarBackgroundRect.height(),
-                progressBarDrawingInfo.progressBarBackgroundColor);
     }
 
     /**
@@ -441,21 +422,6 @@ public class CompositorView
     private native void nativeSetLayoutViewport(long nativeCompositorView, float x, float y,
             float width, float height, float visibleXOffset, float visibleYOffset,
             float dpToPixel);
-    private native void nativeUpdateToolbarLayer(long nativeCompositorView, int resourceId,
-            int toolbarBackgroundColor, int urlBarResourceId, float urlBarAlpha, float topOffset,
-            float brightness, boolean visible, boolean showShadow);
-    private native void nativeUpdateProgressBar(
-            long nativeCompositorView,
-            int progressBarX,
-            int progressBarY,
-            int progressBarWidth,
-            int progressBarHeight,
-            int progressBarColor,
-            int progressBarBackgroundX,
-            int progressBarBackgroundY,
-            int progressBarBackgroundWidth,
-            int progressBarBackgroundHeight,
-            int progressBarBackgroundColor);
     private native void nativeSetOverlayVideoMode(long nativeCompositorView, boolean enabled);
     private native void nativeSetSceneLayer(long nativeCompositorView, SceneLayer sceneLayer);
 }