Commit 862d3445 authored by Chris Lu's avatar Chris Lu Committed by Chromium LUCI CQ

[ios] Place Infobar banner just under omnibox

Bug: 1152900
Change-Id: Id9b1db55a09487cf3e237d2d5de390c5afb9b5ce
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2587388
Commit-Queue: Chris Lu <thegreenfrog@chromium.org>
Auto-Submit: Chris Lu <thegreenfrog@chromium.org>
Reviewed-by: default avatarSergio Collazos <sczs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836376}
parent 182e8c66
...@@ -296,7 +296,7 @@ ...@@ -296,7 +296,7 @@
UIView* omniboxView = omniboxGuide.owningView; UIView* omniboxView = omniboxGuide.owningView;
CGRect omniboxFrame = [omniboxView convertRect:omniboxGuide.layoutFrame CGRect omniboxFrame = [omniboxView convertRect:omniboxGuide.layoutFrame
toView:omniboxView.window]; toView:omniboxView.window];
return CGRectGetMaxY(omniboxFrame) - kInfobarBannerOverlapWithOmnibox; return CGRectGetMaxY(omniboxFrame);
} }
- (UIView*)bannerView { - (UIView*)bannerView {
......
...@@ -20,8 +20,4 @@ extern const NSTimeInterval kInfobarBannerDefaultPresentationDurationInSeconds; ...@@ -20,8 +20,4 @@ extern const NSTimeInterval kInfobarBannerDefaultPresentationDurationInSeconds;
// banner will be presented for. // banner will be presented for.
extern const NSTimeInterval kInfobarBannerLongPresentationDurationInSeconds; extern const NSTimeInterval kInfobarBannerLongPresentationDurationInSeconds;
// The overlap from the bottom of the omnibox NamedGuide for which the banner
// should be laid out.
extern const CGFloat kInfobarBannerOverlapWithOmnibox;
#endif // IOS_CHROME_BROWSER_UI_INFOBARS_INFOBAR_CONSTANTS_H_ #endif // IOS_CHROME_BROWSER_UI_INFOBARS_INFOBAR_CONSTANTS_H_
...@@ -18,6 +18,3 @@ NSString* const kConfirmInfobarButton2AccessibilityIdentifier = ...@@ -18,6 +18,3 @@ NSString* const kConfirmInfobarButton2AccessibilityIdentifier =
const NSTimeInterval kInfobarBannerDefaultPresentationDurationInSeconds = 8.0; const NSTimeInterval kInfobarBannerDefaultPresentationDurationInSeconds = 8.0;
const NSTimeInterval kInfobarBannerLongPresentationDurationInSeconds = 15.0; const NSTimeInterval kInfobarBannerLongPresentationDurationInSeconds = 15.0;
// Banner View constant.
const CGFloat kInfobarBannerOverlapWithOmnibox = 5.0;
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
UIView* owningView = omniboxGuide.owningView; UIView* owningView = omniboxGuide.owningView;
CGRect omniboxFrame = [owningView convertRect:omniboxGuide.layoutFrame CGRect omniboxFrame = [owningView convertRect:omniboxGuide.layoutFrame
toView:owningView.window]; toView:owningView.window];
return CGRectGetMaxY(omniboxFrame) - kInfobarBannerOverlapWithOmnibox; return CGRectGetMaxY(omniboxFrame);
} }
- (UIView*)bannerView { - (UIView*)bannerView {
......
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