Fix URL bar placement on tablets.

Bug: 918342
Change-Id: I9f0a7e24dddb6b612378388c880c501dda4ff6c5
Reviewed-on: https://chromium-review.googlesource.com/c/1392593
Commit-Queue: Tomasz Wiszkowski <ender@google.com>
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#619431}

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

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2018 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. -->
+<merge
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <org.chromium.ui.widget.ChromeImageButton
+        android:id="@+id/location_bar_status_icon"
+        style="@style/LocationBarButton"
+        android:layout_width="@dimen/location_bar_icon_width"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:contentDescription="@string/accessibility_toolbar_btn_site_info"
+        android:scaleType="center" />
+</merge>

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

@@ -11,14 +11,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
 
-        <org.chromium.ui.widget.ChromeImageButton
-            android:id="@+id/location_bar_status_icon"
-            style="@style/LocationBarButton"
-            android:layout_width="@dimen/location_bar_start_icon_width"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:contentDescription="@string/accessibility_toolbar_btn_site_info"
-            android:scaleType="center" />
+        <include layout="@layout/location_status_icon" />
 
         <TextView android:id="@+id/location_bar_verbose_status"
             android:layout_width="wrap_content"

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

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2018 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. -->
+<merge
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <org.chromium.ui.widget.ChromeImageButton
+        android:id="@+id/location_bar_status_icon"
+        style="@style/LocationBarButton"
+        android:layout_width="@dimen/location_bar_start_icon_width"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:paddingEnd="4dp"
+        android:contentDescription="@string/accessibility_toolbar_btn_site_info"
+        android:scaleType="center" />
+</merge>