Add RTL support to custom tabs toolbar

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

 <?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/close_button"
         style="@style/ToolbarButton"
-        android:layout_gravity="center_vertical"
+        android:layout_gravity="start|center_vertical"
         android:contentDescription="@string/close_tab" />
-    <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
+    <view class="org.chromium.chrome.browser.toolbar.CustomTabToolbar$UrlInfoLayout"
         android:id="@+id/url_info_container"
-        android:background="@null"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"

[Yusuf, 2015/07/09 00:22:19]

the need for this confuses me. What happens when you set this to wrap_content?

[Ian Wen, 2015/07/09 01:19:32]

With or without it does not seem to affect anything. Reverted back to
wrap_contents.

         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical" >
-        <TextView
-            android:id="@+id/title_bar"
-            android:background="@null"
-            android:layout_width="wrap_content"
+        <ImageButton
+            android:id="@+id/security_button"
+            style="@style/LocationBarButton"
+            android:layout_width="@dimen/location_bar_icon_width"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:alpha="0"
+            android:contentDescription="@string/accessibility_toolbar_btn_site_info"
+            android:scaleType="center"
+            android:visibility="gone" />
+        <FrameLayout
+            android:id="@+id/title_url_container"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:layout_gravity="top"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:paddingEnd="@dimen/toolbar_edge_padding"
-            android:textSize="@dimen/custom_tabs_title_text_size"
-            android:inputType="none"
-            android:visibility="gone" />
-        <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/location_bar_url_text_size"
-            android:inputType="none" />
-    </FrameLayout>
+            android:layout_gravity="center_vertical"
+            android:background="@null" >
+            <TextView
+                android:id="@+id/title_bar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top"
+                android:layout_marginBottom="16dp"
+                android:background="@null"
+                android:ellipsize="end"
+                android:inputType="none"
+                android:maxLines="1"
+                android:paddingEnd="@dimen/toolbar_edge_padding"
+                android:textSize="@dimen/custom_tabs_title_text_size"
+                android:visibility="gone" />
+            <org.chromium.chrome.browser.omnibox.UrlBar
+                android:id="@+id/url_bar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:background="@null"
+                android:inputType="none"
+                android:maxLines="1"
+                android:paddingEnd="@dimen/toolbar_edge_padding"
+                android:textSize="@dimen/location_bar_url_text_size" />
+        </FrameLayout>
+    </view>
     <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"
@@ skipping 10 matching lines @@
         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>