GitLab

This reverts commit dabaa28e.

Reason for revert: UX wants a different behavior
BUG: http://crbug.com/1039787

Original change's description:
> Fix in app shelf style for Assistant launcher UI
> 
> With the Assistant launcher UI and new shelf design feature turned on,
> if the Assistant is triggered in tablet mode the shelf style will be
> changed back to "home shelf".
> 
> Added an additional check in ShelfConfig for the Assistant state to
> handle this case.
> 
> Bug: 1026727
> Test: Manual Test
> Change-Id: Ie9ca0980583117e5b17d21fa9257f91f3ebe5647
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1975114
> Commit-Queue: Yue Li <updowndota@chromium.org>
> Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
> Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#726929}

TBR=xiyuan@chromium.org,xiaohuic@chromium.org,updowndota@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1026727
Change-Id: Iaae20490e2db0154985d692f96f09f922a7b05ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1990261Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Xiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#729158}