[ios] More fixes for making NTP fullscreen.

Bug: 819460, 832593

Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I6ba2bfc9e22758203b5dc44698e40db5295c79ce
Reviewed-on: https://chromium-review.googlesource.com/1005912Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551386}

ios/chrome/browser/ui/browser_view_controller.mm

@@ -1816,6 +1816,12 @@ applicationCommandEndpoint:(id<ApplicationCommands>)applicationCommandEndpoint {
 
   // Update the toolbar visibility.
   [self updateToolbar];
+
+  // Normally this happens in -viewSafeAreaInsetsDidChange, but added here to
+  // support iOS10.
+  if (IsUIRefreshPhase1Enabled() && !base::ios::IsRunningOnIOS11OrLater()) {
+    [self setUpViewLayout:NO];
+  }
 }
 
 - (void)viewWillTransitionToSize:(CGSize)size

ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_utils.mm

@@ -153,7 +153,7 @@ CGFloat doodleTopMargin(BOOL toolbarPresent) {
   if (IsUIRefreshPhase1Enabled()) {
     if (!IsCompactWidth() && !IsCompactHeight())
       return kDoodleTopMarginRegularXRegular;
-    return kDoodleTopMarginOther;
+    return StatusBarHeight() + kDoodleTopMarginOther;
   }
   if (IsIPadIdiom())
     return kDoodleTopMarginIPadLegacy;

ios/chrome/browser/ui/content_suggestions/content_suggestions_coordinator.mm

@@ -290,7 +290,14 @@
 }
 
 - (CGFloat)overscrollHeaderHeight {
-  return [self.headerController toolBarView].bounds.size.height;
+  CGFloat height = [self.headerController toolBarView].bounds.size.height;
+  CGFloat topInset = 0.0;
+  if (@available(iOS 11, *)) {
+    topInset = self.suggestionsViewController.view.safeAreaInsets.top;
+  } else {
+    topInset = self.suggestionsViewController.topLayoutGuide.length;
+  }
+  return height + topInset;
 }
 
 #pragma mark - NewTabPagePanelProtocol

ios/chrome/browser/ui/content_suggestions/content_suggestions_header_synchronizer.mm

@@ -4,6 +4,8 @@
 
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_header_synchronizer.h"
 
+#include "base/ios/ios_util.h"
+#import "base/mac/foundation_util.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_cell.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_most_visited_cell.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_controlling.h"
@@ -160,10 +162,18 @@ initWithCollectionController:
   }
 
   if (self.shouldAnimateHeader) {
+    UIEdgeInsets insets = SafeAreaInsetsForView(self.collectionView);
+    if (IsUIRefreshPhase1Enabled() && !base::ios::IsRunningOnIOS11OrLater()) {
+      UIViewController* collectionController =
+          base::mac::ObjCCastStrict<UIViewController>(
+              self.collectionController);
+      insets =
+          UIEdgeInsetsMake(collectionController.topLayoutGuide.length, 0, 0, 0);
+    }
     [self.headerController
         updateFakeOmniboxForOffset:self.collectionView.contentOffset.y
                        screenWidth:self.collectionView.frame.size.width
-                    safeAreaInsets:SafeAreaInsetsForView(self.collectionView)];
+                    safeAreaInsets:insets];
   }
 }
 

ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view.mm

@@ -81,9 +81,10 @@ const CGFloat kSearchIconLeftMargin = 9;
     kTabSwitcherGuide,
   ];
   AddNamedGuidesToView(guideNames, self);
+  id<LayoutGuideProvider> layoutGuide = SafeAreaLayoutGuideForView(self);
   [NSLayoutConstraint activateConstraints:@[
     [self.toolBarView.leadingAnchor constraintEqualToAnchor:self.leadingAnchor],
-    [self.toolBarView.topAnchor constraintEqualToAnchor:self.topAnchor],
+    [self.toolBarView.topAnchor constraintEqualToAnchor:layoutGuide.topAnchor],
     [self.toolBarView.trailingAnchor
         constraintEqualToAnchor:self.trailingAnchor],
   ]];

ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller.mm

@@ -202,10 +202,18 @@ const UIEdgeInsets kSearchBoxStretchInsets = {3, 3, 3, 3};
 - (CGFloat)pinnedOffsetY {
   CGFloat headerHeight = content_suggestions::heightForLogoHeader(
       self.logoIsShowing, self.promoCanShow, YES);
+
   CGFloat offsetY =
       headerHeight - ntp_header::kScrolledToTopOmniboxBottomMargin;
-  if (!content_suggestions::IsRegularXRegularSizeClass(self.view))
-    offsetY -= ntp_header::ToolbarHeight();
+  if (!content_suggestions::IsRegularXRegularSizeClass(self.view)) {
+    CGFloat top = 0;
+    if (@available(iOS 11, *)) {
+      top = self.parentViewController.view.safeAreaInsets.top;
+    } else {
+      top = self.parentViewController.topLayoutGuide.length;
+    }
+    offsetY -= ntp_header::ToolbarHeight() + top;
+  }
 
   return offsetY;
 }

ios/chrome/browser/ui/content_suggestions/content_suggestions_layout.mm

@@ -24,8 +24,16 @@
   // top of the screen.
   CGFloat minimumHeight = collectionViewHeight + headerHeight -
                           ntp_header::kScrolledToTopOmniboxBottomMargin;
+  CGFloat topSafeArea = 0;
+  if (IsUIRefreshPhase1Enabled()) {
+    if (@available(iOS 11, *)) {
+      topSafeArea = self.collectionView.safeAreaInsets.top;
+    } else {
+      topSafeArea = StatusBarHeight();
+    }
+  }
   if (!content_suggestions::IsRegularXRegularSizeClass(self.collectionView))
-    minimumHeight -= ntp_header::ToolbarHeight();
+    minimumHeight -= ntp_header::ToolbarHeight() + topSafeArea;
 
   CGSize contentSize = [super collectionViewContentSize];
   if (contentSize.height < minimumHeight) {

ios/chrome/browser/ui/content_suggestions/content_suggestions_view_controller.mm

@@ -216,11 +216,12 @@ BOOL ShouldCellsBeFullWidth(UITraitCollection* collection) {
 
   self.collectionView.prefetchingEnabled = NO;
   if (@available(iOS 11, *)) {
-    // Use automatic behavior as each element takes the safe area into account
-    // separately and the overscroll action does not work well with content
-    // offset.
+    // Overscroll action does not work well with content offset, so set this
+    // to never and internally offset the UI to account for safe area insets.
     self.collectionView.contentInsetAdjustmentBehavior =
-        UIScrollViewContentInsetAdjustmentAutomatic;
+        IsUIRefreshPhase1Enabled()
+            ? UIScrollViewContentInsetAdjustmentNever
+            : UIScrollViewContentInsetAdjustmentAutomatic;
   }
   self.collectionView.accessibilityIdentifier =
       [[self class] collectionAccessibilityIdentifier];