Chromium Code Reviews| Index: ios/clean/chrome/browser/ui/tab/tab_container_view_controller.mm |
| diff --git a/ios/clean/chrome/browser/ui/tab/tab_container_view_controller.mm b/ios/clean/chrome/browser/ui/tab/tab_container_view_controller.mm |
| index 305eac06888c46b00e415dfc7e2edca1d585f0cf..607550d9fb8be76039c22541889254fdcd78fa0d 100644 |
| --- a/ios/clean/chrome/browser/ui/tab/tab_container_view_controller.mm |
| +++ b/ios/clean/chrome/browser/ui/tab/tab_container_view_controller.mm |
| @@ -23,7 +23,8 @@ CGFloat kTabStripHeight = 90.0f; |
| @interface TabContainerViewController () |
| // Container views for child view controllers. The child view controller's |
| -// view is added as a subview that fills it's container view via autoresizing. |
| +// view is added as a subview that fills its container view via autoresizing. |
| +@property(nonatomic, strong) UIView* findBarView; |
| @property(nonatomic, strong) UIView* tabStripView; |
| @property(nonatomic, strong) UIView* toolbarView; |
| @property(nonatomic, strong) UIView* contentView; |
| @@ -45,6 +46,8 @@ CGFloat kTabStripHeight = 90.0f; |
| @implementation TabContainerViewController |
| @synthesize contentViewController = _contentViewController; |
| +@synthesize findBarView = _findBarView; |
| +@synthesize findBarViewController = _findBarViewController; |
| @synthesize toolbarViewController = _toolbarViewController; |
| @synthesize tabStripViewController = _tabStripViewController; |
| @synthesize tabStripView = _tabStripView; |
| @@ -59,20 +62,27 @@ CGFloat kTabStripHeight = 90.0f; |
| - (void)viewDidLoad { |
| [super viewDidLoad]; |
| + self.findBarView = [[UIView alloc] init]; |
| self.tabStripView = [[UIView alloc] init]; |
| self.toolbarView = [[UIView alloc] init]; |
| self.contentView = [[UIView alloc] init]; |
| - [self.view addSubview:self.tabStripView]; |
| - [self.view addSubview:self.toolbarView]; |
| - [self.view addSubview:self.contentView]; |
| + self.findBarView.translatesAutoresizingMaskIntoConstraints = NO; |
| self.tabStripView.translatesAutoresizingMaskIntoConstraints = NO; |
| self.toolbarView.translatesAutoresizingMaskIntoConstraints = NO; |
| self.contentView.translatesAutoresizingMaskIntoConstraints = NO; |
| self.view.backgroundColor = [UIColor blackColor]; |
| + self.findBarView.backgroundColor = [UIColor greenColor]; |
|
lpromero
2017/03/14 17:17:57
Should it be removed now?
|
| self.tabStripView.backgroundColor = [UIColor blackColor]; |
| self.toolbarView.backgroundColor = [UIColor blackColor]; |
| self.contentView.backgroundColor = [UIColor blackColor]; |
| + // Views that are added last have the highest z-order. |
| + [self.view addSubview:self.tabStripView]; |
| + [self.view addSubview:self.toolbarView]; |
| + [self.view addSubview:self.contentView]; |
| + [self.view addSubview:self.findBarView]; |
| + self.findBarView.hidden = YES; |
| + |
| [self addChildViewController:self.tabStripViewController |
| toSubview:self.tabStripView]; |
| [self addChildViewController:self.toolbarViewController |
| @@ -104,6 +114,18 @@ CGFloat kTabStripHeight = 90.0f; |
| _contentViewController = contentViewController; |
| } |
| +- (void)setFindBarViewController:(UIViewController*)findBarViewController { |
| + if (self.findBarViewController == findBarViewController) |
| + return; |
| + if ([self isViewLoaded]) { |
| + [self detachChildViewController:self.findBarViewController]; |
| + [self addChildViewController:findBarViewController |
| + toSubview:self.findBarView]; |
| + } |
| + _findBarViewController = findBarViewController; |
| + self.findBarView.hidden = (_findBarViewController == nil); |
| +} |
| + |
| - (void)setToolbarViewController:(UIViewController*)toolbarViewController { |
| if (self.toolbarViewController == toolbarViewController) |
| return; |
| @@ -224,7 +246,8 @@ CGFloat kTabStripHeight = 90.0f; |
| return nil; |
| } |
| -#pragma mark - TabStripActions |
| +#pragma mark - Action handling |
| + |
| - (void)showTabStrip:(id)sender { |
| self.tabStripHeightConstraint.constant = kTabStripHeight; |
| // HACK: Remove fake action. |
| @@ -281,6 +304,15 @@ CGFloat kTabStripHeight = 90.0f; |
| constraintEqualToAnchor:self.view.trailingAnchor], |
| [self.contentView.bottomAnchor |
| constraintEqualToAnchor:self.bottomLayoutGuide.topAnchor], |
| + |
| + [self.findBarView.topAnchor |
| + constraintEqualToAnchor:self.toolbarView.topAnchor], |
| + [self.findBarView.bottomAnchor |
| + constraintEqualToAnchor:self.toolbarView.bottomAnchor], |
| + [self.findBarView.leadingAnchor |
| + constraintEqualToAnchor:self.toolbarView.leadingAnchor], |
| + [self.findBarView.trailingAnchor |
| + constraintEqualToAnchor:self.toolbarView.trailingAnchor], |
| ]; |
| } |