Inflate toolbar layouts in ControlContainer

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.SearchManager;
@@ skipping 148 matching lines @@
          */
         public AppMenuHandler get(Activity activity, AppMenuPropertiesDelegate delegate,
                 int menuResourceId);
     }
 
     /**
      * No control container to inflate during initialization.
      */
     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;
 
     /**
      * Timeout in ms for reading PartnerBrowserCustomizations provider.
      */
     private static final int PARTNER_BROWSER_CUSTOMIZATIONS_TIMEOUT_MS = 10000;
     private static final String TAG = "ChromeActivity";
     private static final Rect EMPTY_RECT = new Rect();
 
     private TabModelSelector mTabModelSelector;
@@ skipping 165 matching lines @@
             warmupManager.transferViewHierarchyTo(contentParent);
             contentParent.removeView(placeHolderView);
         } else {
             warmupManager.clearViewHierarchy();
 
             // Allow disk access for the content view and toolbar container setup.
             // On certain android devices this setup sequence results in disk writes outside
             // of our control, so we have to disable StrictMode to work. See crbug.com/639352.
             StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
             try {
+                ControlContainer controlContainer = null;
                 setContentView(R.layout.main);
                 if (controlContainerLayoutId != NO_CONTROL_CONTAINER) {
                     ViewStub toolbarContainerStub =
                             ((ViewStub) findViewById(R.id.control_container_stub));
                     toolbarContainerStub.setLayoutResource(controlContainerLayoutId);
-                    toolbarContainerStub.inflate();
+                    controlContainer = (ControlContainer) toolbarContainerStub.inflate();
+                }
+
+                // Inflate the correct toolbar layout for the device.
+                int toolbarLayoutId = getToolbarLayoutId();
+                if (toolbarLayoutId != NO_TOOLBAR_LAYOUT && controlContainer != null) {
+                    controlContainer.initWithToolbar(toolbarLayoutId);
                 }
             } finally {
                 StrictMode.setThreadPolicy(oldPolicy);
             }
         }
         TraceEvent.end("onCreate->setContentView()");
         mInflateInitialLayoutDurationMs = SystemClock.elapsedRealtime() - begin;
 
         // Set the status bar color to black by default. This is an optimization for
         // Chrome not to draw under status and navigation bars when we use the default
@@ skipping 87 matching lines @@
     }
 
     /**
      * @return The resource id for the layout to use for {@link ControlContainer}. 0 by default.
      */
     protected int getControlContainerLayoutId() {
         return NO_CONTROL_CONTAINER;
     }
 
     /**
+     * @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() {
         return true;
     }
 
     @Override
     public void initializeState() {
         super.initializeState();
         mBlimpClientContextDelegate =
@@ skipping 1373 matching lines @@
                 "Android.MultiWindowMode.IsTabletScreenWidthBelow600",
                 mScreenWidthDp < DeviceFormFactor.MINIMUM_TABLET_WIDTH_DP);
 
         if (mScreenWidthDp < DeviceFormFactor.MINIMUM_TABLET_WIDTH_DP) {
             RecordHistogram.recordLinearCountHistogram(
                     "Android.MultiWindowMode.TabletScreenWidth", mScreenWidthDp, 1,
                     DeviceFormFactor.MINIMUM_TABLET_WIDTH_DP, 50);
         }
     }
 }