Inflate toolbar layouts in ControlContainer

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

Index: chrome/android/java/res/layout/toolbar_common.xml
diff --git a/chrome/android/java/res/layout/toolbar_common.xml b/chrome/android/java/res/layout/toolbar_common.xml
deleted file mode 100644
index 1a9cb2637483d5f8ab0ea57b729abbb53e082686..0000000000000000000000000000000000000000
--- a/chrome/android/java/res/layout/toolbar_common.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 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. -->
-
-<!-- The toolbar containing the URL bar, back button, and NTP button.
--->
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:chrome="http://schemas.android.com/apk/res-auto">
-
-    <org.chromium.chrome.browser.widget.newtab.NewTabButton
-        android:id="@+id/new_tab_button"
-        style="@style/ToolbarButton"
-        android:layout_width="wrap_content"
-        android:layout_gravity="start|top"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:visibility="invisible"
-        android:background="?attr/selectableItemBackground"
-        android:contentDescription="@string/accessibility_toolbar_btn_new_tab" />
-
-    <org.chromium.chrome.browser.toolbar.HomePageButton
-        android:id="@+id/home_button"
-        style="@style/ToolbarButton"
-        android:src="@drawable/btn_toolbar_home"
-        android:contentDescription="@string/accessibility_toolbar_btn_home"
-        android:visibility="gone" />
-
-    <org.chromium.chrome.browser.omnibox.LocationBarPhone
-        android:id="@+id/location_bar"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="top" />
-
-    <LinearLayout android:id="@+id/toolbar_buttons"
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top|end" >
-
-        <Space
-            android:layout_width="4dp"
-            android:layout_height="match_parent" />
-
-        <ImageButton android:id="@+id/tab_switcher_button"
-            style="@style/ToolbarButton"
-            android:layout_gravity="top"
-            android:contentDescription="@string/accessibility_toolbar_btn_tabswitcher_toggle_default" />
-
-        <FrameLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/menu_button_wrapper" >
-
-            <org.chromium.chrome.browser.widget.TintedImageButton
-                android:id="@+id/menu_button"
-                style="@style/ToolbarMenuButtonPhone"
-                android:src="@drawable/btn_menu"
-                android:contentDescription="@string/accessibility_toolbar_btn_menu" />
-
-            <ImageView
-                android:id="@+id/menu_badge"
-                style="@style/ToolbarMenuButtonPhone"
-                android:src="@drawable/badge_update_dark"
-                android:contentDescription="@null"
-                android:importantForAccessibility="no"
-                android:visibility="invisible" />
-        </FrameLayout>
-    </LinearLayout>
-
-    <org.chromium.chrome.browser.widget.ToolbarProgressBar
-        android:id="@+id/progress"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/toolbar_progress_bar_height"
-        chrome:progressBarColor="@color/progress_bar_foreground"
-        chrome:backgroundColor="@color/progress_bar_background" />
-
-</merge>