Revert "Respect safe area for NTP view"

This reverts commit d909eb87.

Reason for revert: This CL is causing RecentTabsTableTestCase/testClosedTabAppearsInRecentTabsPanel to fail on iPad: https://build.chromium.org/p/chromium.fyi/builders/EarlGreyiOS/builds/31975

Original change's description:
> Respect safe area for NTP view
> 
> The NTP view cannot use the safeAreaInsets property directly as it is
> snapshotted before being inserted in the view hierarchy, and the safe
> area is only available for views in the view hierarchy.
> This CL introduces a property mirroring the safe area once the view is
> in the view hierarchy. But it is also set up with the value used in the
> first frame, allowing the snapshot to be done as if the view was in the
> view hierarchy.
> 
> Bug: 767869
> Change-Id: I605566105862e9f4c557736ec65df5f8ab1fc76b
> Reviewed-on: https://chromium-review.googlesource.com/681942
> Commit-Queue: Gauthier Ambard <gambard@chromium.org>
> Reviewed-by: Rohit Rao (ping after 24h) <rohitrao@chromium.org>
> Reviewed-by: Jean-François Geyelin <jif@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#505041}

TBR=rohitrao@chromium.org,jif@chromium.org,gambard@chromium.org

Change-Id: I05bb5751f1ec6aec184dfe6ccff7741f2df4182d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 767869
Reviewed-on: https://chromium-review.googlesource.com/690817Reviewed-by: Yuke Liao <liaoyuke@chromium.org>
Commit-Queue: Yuke Liao <liaoyuke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505118}

ios/chrome/browser/ui/browser_view_controller.mm

@@ -3273,13 +3273,6 @@ bubblePresenterForFeature:(const base::Feature&)feature
   std::string url_host = url.host();
   if (url_host == kChromeUINewTabHost ||
       (IsIPadIdiom() && url_host == kChromeUIBookmarksHost)) {
-    CGFloat fakeStatusBarHeight = _fakeStatusBarView.frame.size.height;
-    UIEdgeInsets safeAreaInset = UIEdgeInsetsZero;
-    if (@available(iOS 11.0, *)) {
-      safeAreaInset = self.view.safeAreaInsets;
-    }
-    safeAreaInset.top = MAX(safeAreaInset.top - fakeStatusBarHeight, 0);
-
     NewTabPageController* pageController =
         [[NewTabPageController alloc] initWithUrl:url
                                            loader:self
@@ -3290,8 +3283,7 @@ bubblePresenterForFeature:(const base::Feature&)feature
                                   toolbarDelegate:self
                                          tabModel:_model
                              parentViewController:self
-                                       dispatcher:self.dispatcher
-                                    safeAreaInset:safeAreaInset];
+                                       dispatcher:self.dispatcher];
     pageController.swipeRecognizerProvider = self.sideSwipeController;
 
     // Panel is always NTP for iPhone.

ios/chrome/browser/ui/ntp/new_tab_page_bar.h

@@ -24,17 +24,11 @@
 @interface NewTabPageBar : UIView<UIGestureRecognizerDelegate>
 
 @property(nonatomic, strong) NSArray* items;
-// Which button is currently selected.
 @property(nonatomic, assign) NSUInteger selectedIndex;
-// Percentage of the overlay that sits over the tab bar buttons.
 @property(nonatomic, assign) CGFloat overlayPercentage;
 @property(nonatomic, readonly, strong) NSArray* buttons;
 @property(nonatomic, weak) id<NewTabPageBarDelegate> delegate;
 
-// Safe area set by the NTP view. This is used as the safeAreaInsets of this
-// view as it needs to be used before the safeAreaInsets is set up.
-@property(nonatomic, assign) UIEdgeInsets safeAreaInsetFromNTPView;
-
 // Changes the colors of the buttons and overlay depending on the content offset
 // of the scroll view. Tablet Incognito only.
 - (void)updateColorsForScrollView:(UIScrollView*)scrollView;

ios/chrome/browser/ui/ntp/new_tab_page_bar.mm

@@ -40,9 +40,7 @@ const int kNumberOfTabsIncognito = 2;
 }
 
 @property(nonatomic, readwrite, strong) NSArray* buttons;
-
-// View containing the content and respecting the safe area.
-@property(nonatomic, strong) UIView* contentView;
+@property(nonatomic, readwrite, strong) UIButton* popupButton;
 
 - (void)setup;
 - (void)calculateButtonWidth;
@@ -52,23 +50,29 @@ const int kNumberOfTabsIncognito = 2;
 @end
 
 @implementation NewTabPageBar {
+  // Which button is currently selected.
+  NSUInteger selectedIndex_;
   // Don't allow tabbar animations on startup, only after first tap.
   BOOL canAnimate_;
+  __weak id<NewTabPageBarDelegate> delegate_;
+  // Logo view, used to center the tab buttons.
+  UIImageView* logoView_;
   // Overlay view, used to highlight the selected button.
   UIImageView* overlayView_;
   // Overlay view, used to highlight the selected button.
   UIView* overlayColorView_;
   // Width of a button.
   CGFloat buttonWidth_;
+  // Percentage overlay sits over tab bar buttons.
+  CGFloat overlayPercentage_;
 }
 
 @synthesize items = items_;
 @synthesize selectedIndex = selectedIndex_;
+@synthesize popupButton = popupButton_;
 @synthesize buttons = buttons_;
 @synthesize delegate = delegate_;
 @synthesize overlayPercentage = overlayPercentage_;
-@synthesize contentView = _contentView;
-@synthesize safeAreaInsetFromNTPView = _safeAreaInsetFromNTPView;
 
 - (id)initWithFrame:(CGRect)frame {
   self = [super initWithFrame:frame];
@@ -89,10 +93,10 @@ const int kNumberOfTabsIncognito = 2;
 - (void)setup {
   self.selectedIndex = NSNotFound;
   canAnimate_ = NO;
-  self.backgroundColor = [UIColor whiteColor];
-
-  _contentView = [[UIView alloc] initWithFrame:CGRectZero];
-  [self addSubview:_contentView];
+  self.autoresizingMask =
+      UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleBottomMargin;
+  self.autoresizesSubviews = YES;
+  self.backgroundColor = [UIColor clearColor];
 
   if ([self showOverlay]) {
     overlayView_ =
@@ -109,7 +113,7 @@ const int kNumberOfTabsIncognito = 2;
         setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin |
                             UIViewAutoresizingFlexibleRightMargin];
     [overlayView_ addSubview:overlayColorView_];
-    [_contentView addSubview:overlayView_];
+    [self addSubview:overlayView_];
   }
 
   // Make the drop shadow.
@@ -128,25 +132,22 @@ const int kNumberOfTabsIncognito = 2;
 - (void)layoutSubviews {
   [super layoutSubviews];
 
-  CGRect contentViewFrame =
-      UIEdgeInsetsInsetRect(self.frame, self.safeAreaInsetFromNTPView);
-  contentViewFrame.origin.y = 0;
-  self.contentView.frame = contentViewFrame;
-
   // |buttonWidth_| changes with the screen orientation when the NTP button bar
   // is enabled.
   [self calculateButtonWidth];
 
-  CGFloat buttonPadding = floor((CGRectGetWidth(self.contentView.bounds) -
+  CGFloat logoWidth = logoView_.image.size.width;
+  CGFloat padding = [self useIconsInButtons] ? logoWidth : 0;
+  CGFloat buttonPadding = floor((CGRectGetWidth(self.bounds) - padding -
                                  buttonWidth_ * self.buttons.count) /
-                                2);
+                                    2 +
+                                padding);
 
   for (NSUInteger i = 0; i < self.buttons.count; ++i) {
     NewTabPageBarButton* button = [self.buttons objectAtIndex:i];
-    LayoutRect layout =
-        LayoutRectMake(buttonPadding + (i * buttonWidth_),
-                       CGRectGetWidth(self.contentView.bounds), 0, buttonWidth_,
-                       CGRectGetHeight(self.contentView.bounds));
+    LayoutRect layout = LayoutRectMake(
+        buttonPadding + (i * buttonWidth_), CGRectGetWidth(self.bounds), 0,
+        buttonWidth_, CGRectGetHeight(self.bounds));
     button.frame = LayoutRectGetRect(layout);
     [button
         setContentToDisplay:[self useIconsInButtons]
@@ -165,14 +166,13 @@ const int kNumberOfTabsIncognito = 2;
 }
 
 - (CGSize)sizeThatFits:(CGSize)size {
-  return CGSizeMake(size.width,
-                    kBarHeight + self.safeAreaInsetFromNTPView.bottom);
+  return CGSizeMake(size.width, kBarHeight);
 }
 
 - (void)calculateButtonWidth {
   if (IsCompact()) {
     if ([items_ count] > 0) {
-      buttonWidth_ = self.contentView.bounds.size.width / [items_ count];
+      buttonWidth_ = self.bounds.size.width / [items_ count];
     } else {
       // In incognito on phones, there are no items shown.
       buttonWidth_ = 0;
@@ -202,10 +202,10 @@ const int kNumberOfTabsIncognito = 2;
     for (NSUInteger i = 0; i < newItems.count; ++i) {
       NewTabPageBarItem* item = [newItems objectAtIndex:i];
       NewTabPageBarButton* button = [NewTabPageBarButton buttonWithItem:item];
-      button.frame = CGRectIntegral(
-          CGRectMake(i * buttonWidth_, 0, buttonWidth_, kBarHeight));
+      button.frame = CGRectIntegral(CGRectMake(
+          i * buttonWidth_, 0, buttonWidth_, self.bounds.size.height));
       [self setupButton:button];
-      [self.contentView addSubview:button];
+      [self addSubview:button];
       [newButtons addObject:button];
     }
     self.buttons = newButtons;

ios/chrome/browser/ui/ntp/new_tab_page_controller.h

@@ -89,8 +89,7 @@ std::string FragmentFromIdentifier(ntp_home::PanelIdentifier panel);
               dispatcher:(id<ApplicationCommands,
                              BrowserCommands,
                              OmniboxFocuser,
-                             UrlLoader>)dispatcher
-           safeAreaInset:(UIEdgeInsets)safeAreaInset;
+                             UrlLoader>)dispatcher;
 
 // Select a panel based on the given |panelType|.
 - (void)selectPanel:(ntp_home::PanelIdentifier)panelType;

ios/chrome/browser/ui/ntp/new_tab_page_controller.mm

@@ -220,8 +220,7 @@ enum {
               dispatcher:(id<ApplicationCommands,
                              BrowserCommands,
                              OmniboxFocuser,
-                             UrlLoader>)dispatcher
-           safeAreaInset:(UIEdgeInsets)safeAreaInset {
+                             UrlLoader>)dispatcher {
   self = [super initWithNibName:nil url:url];
   if (self) {
     DCHECK(browserState);
@@ -241,12 +240,11 @@ enum {
         [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, 320, 412)];
     [scrollView setAutoresizingMask:(UIViewAutoresizingFlexibleWidth |
                                      UIViewAutoresizingFlexibleHeight)];
-
-    NewTabPageBar* tabBar = [[NewTabPageBar alloc] init];
-    _view = [[NewTabPageView alloc] initWithFrame:CGRectZero
+    NewTabPageBar* tabBar =
+        [[NewTabPageBar alloc] initWithFrame:CGRectMake(0, 412, 320, 48)];
+    _view = [[NewTabPageView alloc] initWithFrame:CGRectMake(0, 0, 320, 460)
                                     andScrollView:scrollView
                                         andTabBar:tabBar];
-    _view.safeAreaInsetForToolbar = safeAreaInset;
     [tabBar setDelegate:self];
 
     bool isIncognito = _browserState->IsOffTheRecord();
@@ -478,7 +476,7 @@ enum {
 
 // Update selectedIndex and scroll position as the scroll view moves.
 - (void)scrollViewDidScroll:(UIScrollView*)scrollView {
-  if (!_scrollInitialized || PresentNTPPanelModally())
+  if (!_scrollInitialized)
     return;
 
   // Position is used to track the exact X position of the scroll view, whereas

ios/chrome/browser/ui/ntp/new_tab_page_controller_unittest.mm

@@ -20,7 +20,6 @@
 #include "ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.h"
 #import "ios/chrome/browser/sessions/test_session_service.h"
 #import "ios/chrome/browser/tabs/tab_model.h"
-#import "ios/chrome/browser/ui/ntp/modal_ntp.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_view.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #include "ios/chrome/test/block_cleanup_test.h"
@@ -80,8 +79,7 @@ class NewTabPageControllerTest : public BlockCleanupTest {
                                   toolbarDelegate:nil
                                          tabModel:tabModel_
                              parentViewController:parentViewController_
-                                       dispatcher:nil
-                                    safeAreaInset:UIEdgeInsetsZero];
+                                       dispatcher:nil];
 
     incognitoController_ = [[NewTabPageController alloc]
                  initWithUrl:url
@@ -94,8 +92,7 @@ class NewTabPageControllerTest : public BlockCleanupTest {
              toolbarDelegate:nil
                     tabModel:nil
         parentViewController:parentViewController_
-                  dispatcher:nil
-               safeAreaInset:UIEdgeInsetsZero];
+                  dispatcher:nil];
   };
 
   void TearDown() override {
@@ -129,15 +126,14 @@ TEST_F(NewTabPageControllerTest, NewTabBarItemDidChange) {
   NewTabPageBar* bar = [NTPView tabBar];
   NSUInteger bookmarkIndex = 0;
   UIButton* button = [[bar buttons] objectAtIndex:bookmarkIndex];
-  UIControlEvents event = !PresentNTPPanelModally()
-                              ? UIControlEventTouchDown
-                              : UIControlEventTouchUpInside;
+  UIControlEvents event =
+      IsIPadIdiom() ? UIControlEventTouchDown : UIControlEventTouchUpInside;
   [button sendActionsForControlEvents:event];
 
   // Expecting bookmarks panel to be loaded now and to be the current controller
   // on iPad but not iPhone.
   // Deliberately comparing pointers.
-  if (!PresentNTPPanelModally()) {
+  if (IsIPadIdiom()) {
     EXPECT_EQ([controller_ currentController],
               (id<NewTabPagePanelProtocol>)[controller_ bookmarkController]);
   } else {
@@ -158,7 +154,7 @@ TEST_F(NewTabPageControllerTest, SelectBookmarkPanel) {
   // Expecting bookmarks panel to be loaded now and to be the current controller
   // on iPad but not iPhone.
   // Deliberately comparing pointers.
-  if (!PresentNTPPanelModally()) {
+  if (IsIPadIdiom()) {
     EXPECT_EQ([controller_ currentController],
               (id<NewTabPagePanelProtocol>)[controller_ bookmarkController]);
   } else {
@@ -179,7 +175,7 @@ TEST_F(NewTabPageControllerTest, SelectIncognitoPanel) {
   // Expecting bookmarks panel to be loaded now and to be the current controller
   // on iPad but not iPhone.
   // Deliberately comparing pointers.
-  if (!PresentNTPPanelModally()) {
+  if (IsIPadIdiom()) {
     EXPECT_EQ(
         [incognitoController_ currentController],
         (id<NewTabPagePanelProtocol>)[incognitoController_ bookmarkController]);

ios/chrome/browser/ui/ntp/new_tab_page_view.h

@@ -14,12 +14,6 @@
 @interface NewTabPageView : UIView
 @property(nonatomic, weak, readonly) UIScrollView* scrollView;
 @property(nonatomic, weak, readonly) NewTabPageBar* tabBar;
-// Safe area to be used for toolbar. Once the view is part of the view hierarchy
-// and has its own safe area set, this is equal to safeAreaInsets. But as a
-// snapshot of the view is taken before it is inserted in the view hierarchy,
-// this property needs to be set to what would be the safe area after being
-// inserted in the view hierarchy, before the snapshot is taken.
-@property(nonatomic, assign) UIEdgeInsets safeAreaInsetForToolbar;
 
 - (instancetype)initWithFrame:(CGRect)frame
                 andScrollView:(UIScrollView*)scrollView

ios/chrome/browser/ui/ntp/new_tab_page_view.mm

@@ -19,7 +19,6 @@
 
 @synthesize scrollView = scrollView_;
 @synthesize tabBar = tabBar_;
-@synthesize safeAreaInsetForToolbar = _safeAreaInsetForToolbar;
 
 - (instancetype)initWithFrame:(CGRect)frame
                 andScrollView:(UIScrollView*)scrollView
@@ -34,11 +33,6 @@
   return self;
 }
 
-- (void)safeAreaInsetsDidChange {
-  self.safeAreaInsetForToolbar = self.safeAreaInsets;
-  [super safeAreaInsetsDidChange];
-}
-
 - (instancetype)initWithFrame:(CGRect)frame {
   NOTREACHED();
   return nil;
@@ -49,13 +43,6 @@
   return nil;
 }
 
-#pragma mark - Properties
-
-- (void)setSafeAreaInsetForToolbar:(UIEdgeInsets)safeAreaInsetForToolbar {
-  _safeAreaInsetForToolbar = safeAreaInsetForToolbar;
-  self.tabBar.safeAreaInsetFromNTPView = safeAreaInsetForToolbar;
-}
-
 - (void)setFrame:(CGRect)frame {
   // When transitioning the iPhone xib to an iPad idiom, the setFrame call below
   // can sometimes fire a scrollViewDidScroll event which changes the
@@ -114,7 +101,6 @@
         CGRectGetMinX(self.bounds), CGRectGetMinY(self.bounds),
         CGRectGetWidth(self.bounds), CGRectGetMinY(self.tabBar.frame));
   }
-  [self updateScrollViewContentSize];
 
   // When using a new_tab_page_view in autolayout -setFrame is never called,
   // which means all the logic to keep the selected scroll index set is never