| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import "ios/chrome/browser/ui/fullscreen_controller.h" | 5 #import "ios/chrome/browser/ui/fullscreen_controller.h" |
| 6 | 6 |
| 7 #include <cmath> | 7 #include <cmath> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/mac/objc_property_releaser.h" | 10 #include "base/mac/objc_property_releaser.h" |
| (...skipping 669 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 680 - (void)triggerHeader { | 680 - (void)triggerHeader { |
| 681 if (self.isFullScreenDisabled || ![self isScrollViewForCurrentTab]) | 681 if (self.isFullScreenDisabled || ![self isScrollViewForCurrentTab]) |
| 682 return; | 682 return; |
| 683 [self moveHeaderToRestingPosition:YES]; | 683 [self moveHeaderToRestingPosition:YES]; |
| 684 } | 684 } |
| 685 | 685 |
| 686 - (void)setContentViewTopContentPadding:(CGFloat)newTopPadding { | 686 - (void)setContentViewTopContentPadding:(CGFloat)newTopPadding { |
| 687 [webViewProxy_ setTopContentPadding:newTopPadding]; | 687 [webViewProxy_ setTopContentPadding:newTopPadding]; |
| 688 } | 688 } |
| 689 | 689 |
| 690 - (void)setToolbarInsetsForHeaderOffset:(CGFloat)headerOffset | 690 - (void)setToolbarInsetsForHeaderOffset:(CGFloat)headerOffset { |
| 691 forceUpdate:(BOOL)forceUpdate { | |
| 692 // Make space for the header in the scroll view. | 691 // Make space for the header in the scroll view. |
| 693 CGFloat topInset = self.headerHeight - headerOffset; | 692 CGFloat topInset = self.headerHeight - headerOffset; |
| 694 UIEdgeInsets insets = self.scrollViewProxy.contentInset; | 693 UIEdgeInsets insets = self.scrollViewProxy.contentInset; |
| 695 insets.top = topInset; | 694 insets.top = topInset; |
| 696 | 695 |
| 697 [self setContentViewTopContentPadding:topInset]; | 696 [self setContentViewTopContentPadding:topInset]; |
| 698 } | 697 } |
| 699 | 698 |
| 700 #pragma mark - | 699 #pragma mark - |
| 701 #pragma mark CRWWebControllerObserver methods | 700 #pragma mark CRWWebControllerObserver methods |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 778 } | 777 } |
| 779 return YES; | 778 return YES; |
| 780 } | 779 } |
| 781 | 780 |
| 782 #pragma mark - | 781 #pragma mark - |
| 783 #pragma mark CRWWebViewScrollViewProxyObserver | 782 #pragma mark CRWWebViewScrollViewProxyObserver |
| 784 | 783 |
| 785 - (void)webViewScrollViewProxyDidSetScrollView: | 784 - (void)webViewScrollViewProxyDidSetScrollView: |
| 786 (CRWWebViewScrollViewProxy*)webViewScrollViewProxy { | 785 (CRWWebViewScrollViewProxy*)webViewScrollViewProxy { |
| 787 webViewScrollViewProxy.contentOffset = CGPointMake(0.0, -self.headerHeight); | 786 webViewScrollViewProxy.contentOffset = CGPointMake(0.0, -self.headerHeight); |
| 788 [self setToolbarInsetsForHeaderOffset:0.0 forceUpdate:YES]; | 787 [self setToolbarInsetsForHeaderOffset:0.0]; |
| 789 } | 788 } |
| 790 | 789 |
| 791 #pragma mark - UIGestureRecognizerDelegate | 790 #pragma mark - UIGestureRecognizerDelegate |
| 792 | 791 |
| 793 - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer*)gestureRecognizer { | 792 - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer*)gestureRecognizer { |
| 794 return YES; | 793 return YES; |
| 795 } | 794 } |
| 796 | 795 |
| 797 - (BOOL)gestureRecognizer:(UIGestureRecognizer*)gestureRecognizer | 796 - (BOOL)gestureRecognizer:(UIGestureRecognizer*)gestureRecognizer |
| 798 shouldRecognizeSimultaneouslyWithGestureRecognizer: | 797 shouldRecognizeSimultaneouslyWithGestureRecognizer: |
| (...skipping 21 matching lines...) Expand all Loading... |
| 820 overscrollActionsInProgress_ = NO; | 819 overscrollActionsInProgress_ = NO; |
| 821 } | 820 } |
| 822 | 821 |
| 823 #pragma mark - Used for testing | 822 #pragma mark - Used for testing |
| 824 | 823 |
| 825 + (void)setEnabledForTests:(BOOL)enabled { | 824 + (void)setEnabledForTests:(BOOL)enabled { |
| 826 gEnabledForTests = enabled; | 825 gEnabledForTests = enabled; |
| 827 } | 826 } |
| 828 | 827 |
| 829 @end | 828 @end |
| OLD | NEW |