Commit fa86de88 authored by Justin Cohen's avatar Justin Cohen Committed by Commit Bot

[ios] Fix NTP landscape omnibox with alternate search engine.

Followup to crbug.com/848762, which had too broad of a fix.

This narrows the scope of the fix to RxR size class only.

Bug: 848762, 868945
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: Ic72760d395eea7aadc32560133c0885657852bcc
Reviewed-on: https://chromium-review.googlesource.com/1183561Reviewed-by: default avatarJustin Cohen <justincohen@chromium.org>
Reviewed-by: default avatarGauthier Ambard <gambard@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584951}
parent 1187cef2
......@@ -157,9 +157,10 @@ const UIEdgeInsets kSearchBoxStretchInsets = {3, 3, 3, 3};
safeAreaInsets:(UIEdgeInsets)safeAreaInsets {
if (self.isShowing && IsUIRefreshPhase1Enabled()) {
CGFloat progress =
self.logoIsShowing
self.logoIsShowing || !content_suggestions::IsRegularXRegularSizeClass()
? [self.headerView searchFieldProgressForOffset:offset
safeAreaInsets:safeAreaInsets]
// RxR with no logo hides the fakebox, so always show the omnibox.
: 1;
if (!IsSplitToolbarMode()) {
[self.toolbarDelegate setScrollProgressForTabletOmnibox:progress];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment