Inflate toolbar layouts in ControlContainer

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 3c7cb474730bf0084ca54c588ff732598bb12c08..3116949c23473f679519db5d8b5fbb21f2f64a68 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -166,6 +166,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
      */
     static final int NO_CONTROL_CONTAINER = -1;
 
+    /**
+     * No toolbar layout to inflate during initialization.
+     */
+    static final int NO_TOOLBAR_LAYOUT = -1;
+
     private static final int RECORD_MULTI_WINDOW_SCREEN_WIDTH_DELAY_MS = 5000;
 
     /**
@@ -358,6 +363,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
                     toolbarContainerStub.setLayoutResource(controlContainerLayoutId);
                     toolbarContainerStub.inflate();
                 }
+
+                // Inflate the correct toolbar layout for the device.

[gone, 2016/10/12 17:37:45]

Feels weird to not null check the controlContainer here, but I guess it's
developer error if you try to have a toolbar without a control container.

[mdjones, 2016/10/12 20:17:14]

Added check.

+                int toolbarLayoutId = getToolbarLayoutId();
+                if (toolbarLayoutId != NO_TOOLBAR_LAYOUT) {
+                    ControlContainer controlContainer =
+                            (ControlContainer) findViewById(R.id.control_container);
+                    controlContainer.initWithToolbar(toolbarLayoutId);
+                }
             } finally {
                 StrictMode.setThreadPolicy(oldPolicy);
             }
@@ -464,6 +477,13 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
     }
 
     /**
+     * @return The layout ID for the toolbar to use.
+     */
+    protected int getToolbarLayoutId() {
+        return NO_TOOLBAR_LAYOUT;
+    }
+
+    /**
      * @return Whether contextual search is allowed for this activity or not.
      */
     protected boolean isContextualSearchAllowed() {