Inflate toolbar layouts in ControlContainer

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

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
index aca7c216b81b017833e1c5d87d19cbb2e0b38cfc..d23f3ed841462d0968a111fc0aa7741457aca60b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -941,6 +941,15 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
     }
 
     @Override
+    protected int getToolbarLayoutId() {
+        if (DeviceFormFactor.isTablet(getApplicationContext())) return R.layout.toolbar_tablet;
+
+        // TODO(mdjones): Replace with bottom_toolbar layout when available.
+        if (FeatureUtilities.isChromeHomeEnabled()) return R.layout.toolbar_phone;
+        return R.layout.toolbar_phone;
+    }
+
+    @Override
     public void postInflationStartup() {
         super.postInflationStartup();