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

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

Index: chrome/android/java_staging/res/layout/toolbar.xml
diff --git a/chrome/android/java_staging/res/layout/toolbar.xml b/chrome/android/java_staging/res/layout/toolbar.xml
deleted file mode 100644
index 04b041f0320f3048a982c839e87a73dd9401bef9..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/res/layout/toolbar.xml
+++ /dev/null
@@ -1,67 +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.ToolbarPhone
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/toolbar_height_no_shadow" >
-
-    <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" />
-        <org.chromium.chrome.browser.widget.TintedImageButton
-            android:id="@+id/menu_button"
-            style="@style/ToolbarButton"
-            android:layout_gravity="top"
-            android:layout_width="42dp"
-            android:paddingEnd="4dp"
-            android:src="@drawable/btn_menu"
-            android:contentDescription="@string/accessibility_toolbar_btn_menu"
-            android:background="@null" />
-    </LinearLayout>
-    <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.ToolbarPhone>