Create headerHeightForTab in TabHeadersDelegate.

ios/chrome/browser/tabs/tab.mm

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/tabs/tab.h"
 
 #import <CoreLocation/CoreLocation.h>
 #import <UIKit/UIKit.h>
 
 #include <utility>
@@ skipping 75 matching lines @@
 #include "ios/chrome/browser/signin/authentication_service_factory.h"
 #include "ios/chrome/browser/signin/signin_capability.h"
 #import "ios/chrome/browser/snapshots/snapshot_manager.h"
 #import "ios/chrome/browser/snapshots/snapshot_overlay_provider.h"
 #import "ios/chrome/browser/snapshots/web_controller_snapshot_helper.h"
 #include "ios/chrome/browser/ssl/ios_security_state_tab_helper.h"
 #import "ios/chrome/browser/storekit_launcher.h"
 #include "ios/chrome/browser/sync/ios_chrome_synced_tab_delegate.h"
 #import "ios/chrome/browser/tabs/tab_delegate.h"
 #import "ios/chrome/browser/tabs/tab_dialog_delegate.h"
+#import "ios/chrome/browser/tabs/tab_headers_delegate.h"
 #import "ios/chrome/browser/tabs/tab_model.h"
 #import "ios/chrome/browser/tabs/tab_private.h"
 #import "ios/chrome/browser/tabs/tab_snapshotting_delegate.h"
 #include "ios/chrome/browser/translate/chrome_ios_translate_client.h"
 #import "ios/chrome/browser/u2f/u2f_controller.h"
 #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h"
 #import "ios/chrome/browser/ui/commands/generic_chrome_command.h"
 #include "ios/chrome/browser/ui/commands/ios_command_ids.h"
 #import "ios/chrome/browser/ui/commands/open_url_command.h"
 #import "ios/chrome/browser/ui/commands/show_signin_command.h"
@@ skipping 135 matching lines @@
 
   // Delegate used for snapshotting geometry.
   id<TabSnapshottingDelegate> tabSnapshottingDelegate_;  // weak
 
   // The Full Screen Controller responsible for hiding/showing the toolbar.
   base::scoped_nsobject<FullScreenController> fullScreenController_;
 
   base::WeakNSProtocol<id<FullScreenControllerDelegate>>
       fullScreenControllerDelegate_;
 
+  // The delegate responsible for headers over the tab.
+  id<TabHeadersDelegate> tabHeadersDelegate_;  // weak
+
   // The Overscroll controller responsible for displaying the
   // overscrollActionsView above the toolbar.
   base::scoped_nsobject<OverscrollActionsController>
       overscrollActionsController_;
   base::WeakNSProtocol<id<OverscrollActionsControllerDelegate>>
       overscrollActionsControllerDelegate_;
 
   // Lightweight object dealing with various different UI behaviours when
   // opening a URL in an external application.
   base::scoped_nsobject<ExternalAppLauncher> externalAppLauncher_;
@@ skipping 259 matching lines @@
 
 @implementation Tab
 
 @synthesize browserState = browserState_;
 @synthesize useGreyImageCache = useGreyImageCache_;
 @synthesize isPrerenderTab = isPrerenderTab_;
 @synthesize isLinkLoadingPrerenderTab = isLinkLoadingPrerenderTab_;
 @synthesize isVoiceSearchResultsTab = isVoiceSearchResultsTab_;
 @synthesize delegate = delegate_;
 @synthesize tabSnapshottingDelegate = tabSnapshottingDelegate_;
+@synthesize tabHeadersDelegate = tabHeadersDelegate_;
 
 - (instancetype)initWithWindowName:(NSString*)windowName
                             opener:(Tab*)opener
                        openedByDOM:(BOOL)openedByDOM
                              model:(TabModel*)parentModel
                       browserState:(ios::ChromeBrowserState*)browserState {
   NSInteger openerIndex = -1;
   if ([opener navigationManager]) {
     NavigationManagerImpl* openerNavManager = [opener navigationManager];
     openerIndex = openerNavManager->GetLastCommittedItemIndex();
@@ skipping 1217 matching lines @@
   // Return early if the CRWWebController has been closed or web
   // usage is disabled on it.
   if (![self.webController webUsageEnabled])
     return;
   // Check to see if an action sheet can be shown.
   if (self.webState && [self.webState->GetView() window]) {
     // Display the action sheet with the arrow pointing at the top center of the
     // web contents.
     CGFloat xOrigin = CGRectGetMidX(self.webState->GetView().frame);
     CGFloat yOrigin = CGRectGetMinY(self.webState->GetView().frame) +
-                      [[self fullScreenControllerDelegate] headerHeight];
+                      [[self tabHeadersDelegate] headerHeightForTab:self];
     [resubmitDataController_
         presentActionSheetFromRect:CGRectMake(xOrigin, yOrigin, 1, 1)
                             inView:self.webState->GetView()];
     showResubmitDataActionSheetAttempt_ = 0;
     return;
   }
 
   // The resubmit data action cannot be presented as the |contentView_| was not
   // yet added to the window. Retry after |kDelayBetweenAttemptsNanoSecs|.
   // TODO(crbug.com/227868): The strategy to poll until the resubmit data action
@@ skipping 412 matching lines @@
 
   return setting != CONTENT_SETTING_ALLOW;
 }
 
 - (void)webController:(CRWWebController*)webController
         didBlockPopup:(const web::BlockedPopupInfo&)blockedPopupInfo {
   [self popupHandler]->HandlePopup(blockedPopupInfo);
 }
 
 - (CGFloat)headerHeightForWebController:(CRWWebController*)webController {
-  return [fullScreenControllerDelegate_ headerHeight];
+  DCHECK(webController == [self webController]);
+  return [tabHeadersDelegate_ headerHeightForTab:self];

[noyau (Ping after 24h), 2017/01/10 13:10:54]

Nit: You use [self tabHeadersDelegate] on line 1772, and tabHeadersDelegate_
here. I suggest you use self.tabHeadersDelegate in both places.

[Olivier, 2017/01/10 18:27:09]

Done.

 }
 
 - (void)webControllerDidUpdateSSLStatusForCurrentNavigationItem:
     (CRWWebController*)webController {
   // Disable fullscreen if SSL cert is invalid.
   web::NavigationItem* item = [self navigationManager]->GetTransientItem();
   web::SecurityStyle securityStyle =
       item ? item->GetSSL().security_style : web::SECURITY_STYLE_UNKNOWN;
   if (securityStyle == web::SECURITY_STYLE_AUTHENTICATION_BROKEN) {
     [fullScreenController_ disableFullScreen];
@@ skipping 240 matching lines @@
 
 - (TabModel*)parentTabModel {
   return parentTabModel_;
 }
 
 - (FormInputAccessoryViewController*)inputAccessoryViewController {
   return inputAccessoryViewController_.get();
 }
 
 @end