Move remaining resources from java_staging/res to java/res.

chrome/android/java_staging/res/layout/custom_tabs_toolbar.xml

Index: chrome/android/java_staging/res/layout/custom_tabs_toolbar.xml
diff --git a/chrome/android/java_staging/res/layout/custom_tabs_toolbar.xml b/chrome/android/java_staging/res/layout/custom_tabs_toolbar.xml
deleted file mode 100644
index 5f117bee6a98987d42780a2958cc2f20215775fe..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/res/layout/custom_tabs_toolbar.xml
+++ /dev/null
@@ -1,79 +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. -->
-
-<org.chromium.chrome.browser.toolbar.CustomTabToolbar xmlns:android="http://schemas.android.com/apk/res/android">
-    <org.chromium.chrome.browser.widget.TintedImageButton
-        android:id="@+id/back_button"
-        style="@style/ToolbarButton"
-        android:layout_gravity="center_vertical"
-        android:src="@drawable/btn_chevron_left" />
-    <ImageButton android:id="@+id/security_button"
-        style="@style/LocationBarButton"
-        android:layout_width="@dimen/location_bar_icon_width"
-        android:layout_height="match_parent"
-        android:layout_marginStart="48dp"
-        android:scaleType="center"
-        android:layout_gravity="center_vertical"
-        android:alpha="0"
-        android:visibility="gone"
-        android:contentDescription="@string/accessibility_toolbar_btn_site_info" />
-    <FrameLayout
-        android:id="@+id/url_info_container"
-        android:background="@null"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical" >
-        <TextView
-            android:id="@+id/title_bar"
-            android:background="@null"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:layout_gravity="top"
-            android:maxLines="1"
-            android:paddingEnd="@dimen/toolbar_edge_padding"
-            android:textSize="@dimen/custom_tabs_title_text_size"
-            android:inputType="none" />
-        <org.chromium.chrome.browser.omnibox.UrlBar
-            android:id="@+id/url_bar"
-            android:background="@null"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity ="bottom"
-            android:maxLines="1"
-            android:paddingEnd="@dimen/toolbar_edge_padding"
-            android:textSize="@dimen/custom_tabs_url_text_size"
-            android:inputType="none" />
-    </FrameLayout>
-    <ImageButton
-        android:id="@+id/action_button"
-        style="@style/ToolbarButton"
-        android:layout_width="wrap_content"
-        android:maxWidth="@dimen/custom_tabs_toolbar_maxWidth"
-        android:paddingTop="@dimen/custom_tabs_toolbar_vertical_padding"
-        android:paddingBottom="@dimen/custom_tabs_toolbar_vertical_padding"
-        android:adjustViewBounds="true"
-        android:scaleType="centerInside"
-        android:layout_marginEnd="42dp"
-        android:layout_gravity="center_vertical|end"
-        android:visibility="gone"
-        android:contentDescription="@string/accessibility_toolbar_btn_custom" />
-    <org.chromium.chrome.browser.widget.TintedImageButton
-        android:id="@+id/menu_button"
-        style="@style/ToolbarButton"
-        android:layout_gravity="center_vertical|end"
-        android:layout_width="42dp"
-        android:paddingEnd="4dp"
-        android:src="@drawable/btn_menu"
-        android:contentDescription="@string/accessibility_toolbar_btn_menu"
-        android:background="@null" />
-    <org.chromium.chrome.browser.widget.ToolbarProgressBar
-        android:id="@+id/progress"
-        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-        android:progressDrawable="@drawable/progress_bar"
-        android:layout_width="match_parent"
-        android:layout_height="2dp"
-        android:progress="0" />
-</org.chromium.chrome.browser.toolbar.CustomTabToolbar>