Inflate toolbar layouts in ControlContainer

chrome/android/java/res/layout-sw600dp/toolbar.xml

Index: chrome/android/java/res/layout-sw600dp/toolbar.xml
diff --git a/chrome/android/java/res/layout-sw600dp/toolbar.xml b/chrome/android/java/res/layout-sw600dp/toolbar.xml
deleted file mode 100644
index f93f93f77a2b92caecf8f97efa71a70b6a2c06ed..0000000000000000000000000000000000000000
--- a/chrome/android/java/res/layout-sw600dp/toolbar.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<!-- The toolbar containing the URL bar, back button, and NTP button.
--->
-
-<org.chromium.chrome.browser.toolbar.ToolbarTablet
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/toolbar_height_no_shadow"
-    android:layout_marginTop="@dimen/tab_strip_height"
-    android:background="@color/default_primary_color"
-    android:paddingStart="@dimen/tablet_toolbar_start_padding" >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal" >
-
-        <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.widget.TintedImageButton
-            android:id="@+id/back_button"
-            style="@style/ToolbarButton"
-            android:src="@drawable/btn_back"
-            android:contentDescription="@string/accessibility_toolbar_btn_back" />
-
-        <org.chromium.chrome.browser.widget.TintedImageButton
-            android:id="@+id/forward_button"
-            style="@style/ToolbarButton"
-            android:src="@drawable/btn_forward"
-            android:contentDescription="@string/accessibility_toolbar_btn_forward" />
-
-        <org.chromium.chrome.browser.widget.TintedImageButton
-            android:id="@+id/refresh_button"
-            style="@style/ToolbarButton"
-            android:src="@drawable/btn_toolbar_reload"
-            android:contentDescription="@string/accessibility_btn_refresh" />
-
-        <org.chromium.chrome.browser.omnibox.LocationBarTablet
-            android:id="@+id/location_bar"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="5dp"
-            android:layout_marginTop="5dp"
-            android:layout_weight="1"
-            android:layout_gravity="top|center"
-            android:background="@drawable/textbox"
-            android:paddingEnd="1dp"
-            android:paddingStart="2dp" />
-
-        <ImageButton
-            android:id="@+id/tab_switcher_button"
-            style="@style/ToolbarButton"
-            android:contentDescription="@string/accessibility_toolbar_btn_tabswitcher_toggle_default"
-            android:visibility="gone" />
-
-        <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/ToolbarMenuButtonTablet"
-                android:src="@drawable/btn_menu"
-                android:contentDescription="@string/accessibility_toolbar_btn_menu" />
-
-            <ImageView
-                android:id="@+id/menu_badge"
-                style="@style/ToolbarMenuButtonTablet"
-                android:src="@drawable/badge_update_dark"
-                android:contentDescription="@null"
-                android:importantForAccessibility="no"
-                android:visibility="invisible" />
-
-        </FrameLayout>
-    </LinearLayout>
-</org.chromium.chrome.browser.toolbar.ToolbarTablet>