ControlContainer is now a child of CompositorViewHolder

chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
index 872eabecd8986db504be746a50eea9d7ef666f84..8c96f08683f3c4abde45122bb3e38539cb7a07c0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -22,9 +22,11 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.StrictMode;
 import android.os.SystemClock;
+import android.support.design.widget.CoordinatorLayout.LayoutParams;
 import android.support.v7.app.AlertDialog;
 import android.util.DisplayMetrics;
 import android.util.Pair;
+import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -380,8 +382,16 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
                 if (controlContainerLayoutId != NO_CONTROL_CONTAINER) {
                     ViewStub toolbarContainerStub =
                             ((ViewStub) findViewById(R.id.control_container_stub));
+
                     toolbarContainerStub.setLayoutResource(controlContainerLayoutId);
-                    toolbarContainerStub.inflate();
+                    View container = toolbarContainerStub.inflate();
+
+                    // If the control container is at the bottom apply Gravity.BOTTOM here since
+                    // it is not respected in the XML while the ViewStub in between the
+                    // CompositorViewHolder and ControlContainer.
+                    if (controlContainerLayoutId == R.layout.bottom_control_container) {
+                        ((LayoutParams) container.getLayoutParams()).gravity = Gravity.BOTTOM;
+                    }
                 }
 
                 // It cannot be assumed that the result of toolbarContainerStub.inflate() will be