Fix incognito icon in wrong spot in omnibox.

Every use of LocationBarButton aside from the omnibox incognito icon
were setting their layout_gravity explicitly, so having
LocationBarButton have a gravity of end wasn't an issue elsewhere.
This brings back the original LocationBarButton and creates the
LocationBarActionButton for action buttons instead.

TBR=yusufo@chromium.org

Bug: 831535
Change-Id: If78e27c32c09d0a462a15503ab73f89788d603bd
Reviewed-on: https://chromium-review.googlesource.com/1008169
Commit-Queue: Troy Hildebrandt <thildebr@chromium.org>
Reviewed-by: Matthew Jones <mdjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550219}

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

@@ -12,27 +12,27 @@
 
         <org.chromium.chrome.browser.widget.TintedImageButton
             android:id="@+id/delete_button"
-            style="@style/LocationBarButton"
+            style="@style/LocationBarActionButton"
             android:src="@drawable/btn_delete_24dp"
             android:visibility="invisible"
             android:contentDescription="@string/accessibility_toolbar_btn_delete_url" />
 
         <org.chromium.chrome.browser.widget.TintedImageButton
             android:id="@+id/mic_button"
-            style="@style/LocationBarButton"
+            style="@style/LocationBarActionButton"
             android:src="@drawable/btn_mic"
             android:visibility="invisible"
             android:contentDescription="@string/accessibility_toolbar_btn_mic" />
 
         <org.chromium.chrome.browser.widget.TintedImageButton
             android:id="@+id/bookmark_button"
-            style="@style/LocationBarButton"
+            style="@style/LocationBarActionButton"
             android:visibility="gone"
             android:contentDescription="@string/accessibility_menu_bookmark" />
 
        <org.chromium.chrome.browser.widget.TintedImageButton
             android:id="@+id/save_offline_button"
-            style="@style/LocationBarButton"
+            style="@style/LocationBarActionButton"
             android:nextFocusForward="@+id/menu_button"
             android:src="@drawable/ic_file_download_white_24dp"
             android:visibility="gone"

chrome/android/java/res/values-v17/styles.xml

@@ -548,6 +548,8 @@
     <!-- Misc styles -->
     <style name="LocationBarButton">
         <item name="android:background">@null</item>
+    </style>
+    <style name="LocationBarActionButton" parent="LocationBarButton">
         <item name="android:layout_width">@dimen/location_bar_icon_width</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:scaleType">center</item>