Create headerHeightForTab in TabHeadersDelegate.

ios/chrome/browser/ui/browser_view_controller.mm

Index: ios/chrome/browser/ui/browser_view_controller.mm
diff --git a/ios/chrome/browser/ui/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view_controller.mm
index dba26efc255093fb1f866eea27f75fb741f7dd64..4f3aefd2e870fb1955e226eb0851f70a761bfef8 100644
--- a/ios/chrome/browser/ui/browser_view_controller.mm
+++ b/ios/chrome/browser/ui/browser_view_controller.mm
@@ -734,7 +734,7 @@ NSString* const kReadingListSnackbarCategory = @"ReadingListSnackbarCategory";
 // Returns the footer view if one exists (e.g. the voice search bar).
 - (UIView*)footerView;
 // Returns the height of the header view for the tab model's current tab.
-- (CGFloat)headerHeight;
+- (CGFloat)headerHeightForCurrentTab;
 // Returns the height of the header view for |tab|.
 - (CGFloat)headerHeightForTab:(Tab*)tab;
 // Sets the frame for the headers.
@@ -1115,7 +1115,7 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
 }
 
 - (BOOL)isToolbarOnScreen {
-  return [self headerHeight] - [self currentHeaderOffset] > 0;
+  return [self headerHeightForCurrentTab] - [self currentHeaderOffset] > 0;
 }
 
 - (BOOL)isInNewTabAnimation {
@@ -1830,7 +1830,8 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
   // the toolbar is not fullscreen.
   CGRect contentFrame = [_contentArea frame];
   CGFloat marginWithHeader = StatusBarHeight();
-  CGFloat overlap = [self headerHeight] != 0 ? marginWithHeader : minY;
+  CGFloat overlap =
+      [self headerHeightForCurrentTab] != 0 ? marginWithHeader : minY;
   contentFrame.size.height = CGRectGetMaxY(contentFrame) - overlap;
   contentFrame.origin.y = overlap;
   [_contentArea setFrame:contentFrame];
@@ -2084,8 +2085,8 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
 - (UIImageView*)pageOpenCloseAnimationView {
   CGRect frame = [_contentArea bounds];
 
-  frame.size.height = frame.size.height - [self headerHeight];
-  frame.origin.y = [self headerHeight];
+  frame.size.height = frame.size.height - [self headerHeightForCurrentTab];
+  frame.origin.y = [self headerHeightForCurrentTab];
 
   UIImageView* pageView =
       [[[UIImageView alloc] initWithFrame:frame] autorelease];
@@ -2584,7 +2585,7 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
   return _voiceSearchBar;
 }
 
-- (CGFloat)headerHeight {
+- (CGFloat)headerHeightForCurrentTab {
   return [self headerHeightForTab:[_model currentTab]];
 }
 
@@ -2621,10 +2622,11 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
   if (!headers.size())
     return 0.0;
 
-  // Prerender tab does not have a toolbar, return |headerHeight| as promised by
+  // Prerender tab does not have a toolbar, return |headerHeightForCurrentTab|
+  // as promised by
   // API documentation.
   if ([[[self tabModel] currentTab] isPrerenderTab])
-    return [self headerHeight];
+    return [self headerHeightForCurrentTab];
 
   UIView* topHeader = headers[0].view;
   return -(topHeader.frame.origin.y - [self headerOffset]);
@@ -2632,7 +2634,7 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
 
 - (CGFloat)footerYForHeaderOffset:(CGFloat)headerOffset {
   UIView* footer = [self footerView];
-  CGFloat headerHeight = [self headerHeight];
+  CGFloat headerHeight = [self headerHeightForCurrentTab];
   if (!footer || headerHeight == 0)
     return 0.0;
 
@@ -2798,13 +2800,13 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
 - (CGFloat)overscrollActionsControllerHeaderInset:
     (OverscrollActionsController*)controller {
   if (controller == [[[self tabModel] currentTab] overscrollActionsController])
-    return [self headerHeight];
+    return [self headerHeightForCurrentTab];
   else
     return 0;
 }
 
 - (CGFloat)overscrollHeaderHeight {
-  return [self headerHeight] + StatusBarHeight();
+  return [self headerHeightForCurrentTab] + StatusBarHeight();
 }
 
 #pragma mark - TabSnapshottingDelegate methods.
@@ -3683,7 +3685,7 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
 
 // This is called from within an animation block.
 - (void)toolbarHeightChanged {
-  if ([self headerHeight] != 0) {
+  if ([self headerHeightForCurrentTab] != 0) {
     // Ensure full screen height is updated.
     Tab* currentTab = [_model currentTab];
     BOOL visible = self.isToolbarOnScreen;
@@ -3839,7 +3841,7 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
   CGRect frame = [_contentArea frame];
   if (!fullScreen) {
     // Changing the origin here is unnecessary, it's set in page_animation_util.
-    frame.size.height -= [self headerHeight];
+    frame.size.height -= [self headerHeightForCurrentTab];
   }
 
   CGFloat shortAxis = frame.size.width;
@@ -4736,7 +4738,7 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
 }
 
 - (CGFloat)currentHeaderHeight {
-  return [self headerHeight] - [self currentHeaderOffset];
+  return [self headerHeightForCurrentTab] - [self currentHeaderOffset];
 }
 
 #pragma mark - InfoBarControllerDelegate