move new tab button next to tabs

     http://b/issue?id=3052018
     moved tab button
     added new tab option to menu
     http://b/issue?id=3052583
     changed text from window to tab

Change-Id: I079636f29ea529915a5f8c3ad55b4b4c7afe579f
diff --git a/res/layout/tab_bar.xml b/res/layout/tab_bar.xml
index 7967307..2726055 100644
--- a/res/layout/tab_bar.xml
+++ b/res/layout/tab_bar.xml
@@ -10,17 +10,24 @@
         the specific language governing permissions and limitations under the
         License.
     -->
-<LinearLayout
+<merge
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/tabbarcontent"
     android:layout_width="match_parent"
     android:layout_height="48dip"
+    android:orientation="horizontal"
     style="@style/ActionBarStyle"
-    android:orientation="horizontal">
+    >
     <com.android.browser.TabScrollView
         android:id="@+id/tabs"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_weight="1.0"
         android:orientation="horizontal" />
-</LinearLayout>
+    <ImageButton
+        android:id="@+id/newtab"
+        android:src="@drawable/ic_menu_new_window"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        style="@style/HoloButton"
+        android:background="@drawable/browserbarbutton" />
+</merge>
\ No newline at end of file