ControlContainer is now a child of CompositorViewHolder

chrome/android/java/res/layout/main.xml

Index: chrome/android/java/res/layout/main.xml
diff --git a/chrome/android/java/res/layout/main.xml b/chrome/android/java/res/layout/main.xml
index bd8c9a51ebc73dfbf38a06f44796f002bbf85f74..33fac2edb166dac3c433219860c749fb28fddb0f 100644
--- a/chrome/android/java/res/layout/main.xml
+++ b/chrome/android/java/res/layout/main.xml
@@ -25,6 +25,25 @@
                 android:layout="@layout/omnibox_results_container"
                 app:layout_behavior="org.chromium.chrome.browser.compositor.CompositorViewHolderBehavior" />
 
+            <!-- Toolbar size area painted black to avoid the action bar showing the window background -->
+            <View
+                android:id="@+id/action_bar_black_background"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/toolbar_height_no_shadow"
+                android:background="#000000"

[Ian Wen, 2016/12/09 19:03:06]

Nit: use @android:color/black here.

[mdjones, 2016/12/09 21:48:11]

Done.

+                android:visibility="gone" />
+            <ViewStub
+                android:id="@+id/control_container_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_behavior="org.chromium.chrome.browser.compositor.CompositorViewHolderBehavior" />
+            <ViewStub
+                android:id="@+id/empty_container_stub"
+                android:inflatedId="@+id/empty_container"
+                android:layout="@layout/empty_background_view_tablet"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
         </org.chromium.chrome.browser.compositor.CompositorViewHolder>
 
         <HorizontalScrollView
@@ -44,23 +63,6 @@
             android:layout_height="wrap_content" />
     </LinearLayout>
 
-    <!-- Toolbar size area painted black to avoid the action bar showing the window background -->
-    <View
-        android:id="@+id/action_bar_black_background"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/toolbar_height_no_shadow"
-        android:background="#000000"
-        android:visibility="gone" />
-    <ViewStub
-        android:id="@+id/control_container_stub"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-    <ViewStub
-        android:id="@+id/empty_container_stub"
-        android:inflatedId="@+id/empty_container"
-        android:layout="@layout/empty_background_view_tablet"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
     <!-- This empty view is used as the anchor for custom menu -->
     <View
         android:id="@+id/menu_anchor_stub"