Commit 82c6f1b6 authored by Roberto Moura's avatar Roberto Moura Committed by Commit Bot

Remove handle bar under the Omnibox.

Remove the handle bar that appears under the Omnibox when the thumb
strip feature is enabled.

Bug: 1094335
Change-Id: Ib07d307540412e22ee096eb0155583f3e51f7149
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2485499
Auto-Submit: Roberto Moura <mouraroberto@google.com>
Reviewed-by: default avatarRobbie Gibson <rkgibson@google.com>
Reviewed-by: default avatarGauthier Ambard <gambard@chromium.org>
Commit-Queue: Roberto Moura <mouraroberto@google.com>
Cr-Commit-Position: refs/heads/master@{#821241}
parent 3cf44a1a
...@@ -55,9 +55,6 @@ ...@@ -55,9 +55,6 @@
// Separator below the toolbar, redefined as readwrite. // Separator below the toolbar, redefined as readwrite.
@property(nonatomic, strong, readwrite) UIView* separator; @property(nonatomic, strong, readwrite) UIView* separator;
// HandleBar attached to the bottom of the toolbar, redefined as readwrite.
@property(nonatomic, strong, readwrite) UIView* handleBar;
#pragma mark** Buttons in the leading stack view. ** #pragma mark** Buttons in the leading stack view. **
// Button to navigate back, redefined as readwrite. // Button to navigate back, redefined as readwrite.
@property(nonatomic, strong, readwrite) ToolbarButton* backButton; @property(nonatomic, strong, readwrite) ToolbarButton* backButton;
...@@ -150,9 +147,6 @@ ...@@ -150,9 +147,6 @@
[self setUpProgressBar]; [self setUpProgressBar];
[self setUpCollapsedToolbarButton]; [self setUpCollapsedToolbarButton];
[self setUpSeparator]; [self setUpSeparator];
if (IsThumbStripEnabled()) {
[self setUpHandleBar];
}
[self setUpConstraints]; [self setUpConstraints];
} }
...@@ -296,15 +290,6 @@ ...@@ -296,15 +290,6 @@
[self addSubview:self.separator]; [self addSubview:self.separator];
} }
// Sets the handleBar up.
- (void)setUpHandleBar {
self.handleBar = [[UIView alloc] init];
self.handleBar.backgroundColor = [UIColor colorNamed:kToolbarShadowColor];
self.handleBar.layer.cornerRadius = kHandleBarHeight / 2.0;
self.handleBar.translatesAutoresizingMaskIntoConstraints = NO;
[self addSubview:self.handleBar];
}
// Sets the constraints up. // Sets the constraints up.
- (void)setUpConstraints { - (void)setUpConstraints {
id<LayoutGuideProvider> safeArea = self.safeAreaLayoutGuide; id<LayoutGuideProvider> safeArea = self.safeAreaLayoutGuide;
...@@ -414,18 +399,6 @@ ...@@ -414,18 +399,6 @@
// CollapsedToolbarButton constraints. // CollapsedToolbarButton constraints.
AddSameConstraints(self, self.collapsedToolbarButton); AddSameConstraints(self, self.collapsedToolbarButton);
// HandleBar Constraints.
if (self.handleBar) {
[NSLayoutConstraint activateConstraints:@[
[self.handleBar.bottomAnchor
constraintEqualToAnchor:self.bottomAnchor
constant:-kHandleBarBottomAnchorConstant],
[self.handleBar.centerXAnchor constraintEqualToAnchor:self.centerXAnchor],
[self.handleBar.heightAnchor constraintEqualToConstant:kHandleBarHeight],
[self.handleBar.widthAnchor constraintEqualToConstant:kHandleBarWidth],
]];
}
} }
#pragma mark - Property accessors #pragma mark - Property accessors
......
...@@ -34,11 +34,6 @@ extern const CGFloat kProgressBarHeight; ...@@ -34,11 +34,6 @@ extern const CGFloat kProgressBarHeight;
// Height of the separator. Should be aligned to upper pixel. // Height of the separator. Should be aligned to upper pixel.
extern const CGFloat kToolbarSeparatorHeight; extern const CGFloat kToolbarSeparatorHeight;
// HandleBar width, height, and bottom anchor constant.
extern const CGFloat kHandleBarWidth;
extern const CGFloat kHandleBarHeight;
extern const CGFloat kHandleBarBottomAnchorConstant;
// Toolbar Buttons. // Toolbar Buttons.
extern const CGFloat kAdaptiveToolbarButtonHeight; extern const CGFloat kAdaptiveToolbarButtonHeight;
extern const CGFloat kAdaptiveToolbarButtonWidth; extern const CGFloat kAdaptiveToolbarButtonWidth;
......
...@@ -23,10 +23,6 @@ const CGFloat kProgressBarHeight = 2.0f; ...@@ -23,10 +23,6 @@ const CGFloat kProgressBarHeight = 2.0f;
const CGFloat kToolbarSeparatorHeight = 0.1f; const CGFloat kToolbarSeparatorHeight = 0.1f;
const CGFloat kHandleBarWidth = 60.0f;
const CGFloat kHandleBarHeight = 4.5f;
const CGFloat kHandleBarBottomAnchorConstant = 2.7f;
const CGFloat kAdaptiveToolbarButtonHeight = 44.0f; const CGFloat kAdaptiveToolbarButtonHeight = 44.0f;
const CGFloat kAdaptiveToolbarButtonWidth = 44.0f; const CGFloat kAdaptiveToolbarButtonWidth = 44.0f;
const CGFloat kSearchButtonWidth = 70.0f; const CGFloat kSearchButtonWidth = 70.0f;
......
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