GitLab

This reverts commit cb5a488e.

Reason for revert: Forgot to remove the #getUrlContainerViewsForMargin to avoid overlap with the action container. Will create another patch that fixes this.

Original change's description:
> Bring the URL action container to LocationBarTablet.
> 
> On tablets, the layout for the location bar is overridden by the XML
> in layout-sw600dp, which means instead of the url_action_container used
> elsewhere, it's a series of FrameLayouts for action buttons with
> manually calculated margins.
> 
> This CL breaks the url_action_container into its own file to be included
> on both phone and tablet, and gets rid of the tablet-specific layout
> update for calculating the margin of the action buttons.
> 
> Bug: 820273
> Change-Id: I104551325f49dbee0931e9a55c105d61e55f7796
> Reviewed-on: https://chromium-review.googlesource.com/971404
> Reviewed-by: Matthew Jones <mdjones@chromium.org>
> Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
> Commit-Queue: Troy Hildebrandt <thildebr@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#548580}

TBR=yusufo@chromium.org,mdjones@chromium.org,thildebr@chromium.org

Change-Id: I274354f53cfa71a235abbb475acaec88580dbfba
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 820273
Reviewed-on: https://chromium-review.googlesource.com/998593Reviewed-by: Troy Hildebrandt <thildebr@chromium.org>
Commit-Queue: Troy Hildebrandt <thildebr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548588}