Commit 9f296a1b authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

Remove unused Tab -isLinkLoadingPrerenderTab.

Bug: 760556
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I5a892956e3b3247d1c01d42f1c6a04bb4a9ec8b1
Reviewed-on: https://chromium-review.googlesource.com/727023Reviewed-by: default avatarRohit Rao (ping after 24h) <rohitrao@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#510100}
parent b9b5af0f
...@@ -134,7 +134,6 @@ extern NSString* const kProxyPassthroughHeaderValue; ...@@ -134,7 +134,6 @@ extern NSString* const kProxyPassthroughHeaderValue;
// TODO(crbug.com/661663): Should this property abstract away the concept of // TODO(crbug.com/661663): Should this property abstract away the concept of
// prerendering? Maybe this can move to the TabDelegate interface. // prerendering? Maybe this can move to the TabDelegate interface.
@property(nonatomic, assign) BOOL isPrerenderTab; @property(nonatomic, assign) BOOL isPrerenderTab;
@property(nonatomic, assign) BOOL isLinkLoadingPrerenderTab;
@property(nonatomic, assign) BOOL isVoiceSearchResultsTab; @property(nonatomic, assign) BOOL isVoiceSearchResultsTab;
// |YES| if the tab has finished loading. // |YES| if the tab has finished loading.
......
...@@ -306,7 +306,6 @@ void TabInfoBarObserver::OnInfoBarReplaced(infobars::InfoBar* old_infobar, ...@@ -306,7 +306,6 @@ void TabInfoBarObserver::OnInfoBarReplaced(infobars::InfoBar* old_infobar,
_iOSCaptivePortalBlockingPageDelegate; _iOSCaptivePortalBlockingPageDelegate;
@synthesize useGreyImageCache = useGreyImageCache_; @synthesize useGreyImageCache = useGreyImageCache_;
@synthesize isPrerenderTab = _isPrerenderTab; @synthesize isPrerenderTab = _isPrerenderTab;
@synthesize isLinkLoadingPrerenderTab = isLinkLoadingPrerenderTab_;
@synthesize isVoiceSearchResultsTab = _isVoiceSearchResultsTab; @synthesize isVoiceSearchResultsTab = _isVoiceSearchResultsTab;
@synthesize overscrollActionsController = _overscrollActionsController; @synthesize overscrollActionsController = _overscrollActionsController;
@synthesize overscrollActionsControllerDelegate = @synthesize overscrollActionsControllerDelegate =
...@@ -440,19 +439,13 @@ void TabInfoBarObserver::OnInfoBarReplaced(infobars::InfoBar* old_infobar, ...@@ -440,19 +439,13 @@ void TabInfoBarObserver::OnInfoBarReplaced(infobars::InfoBar* old_infobar,
return self.webState ? self.webState->GetNavigationManager() : nullptr; return self.webState ? self.webState->GetNavigationManager() : nullptr;
} }
- (void)setIsLinkLoadingPrerenderTab:(BOOL)isLinkLoadingPrerenderTab {
isLinkLoadingPrerenderTab_ = isLinkLoadingPrerenderTab;
[self setIsPrerenderTab:isLinkLoadingPrerenderTab];
}
- (void)setIsPrerenderTab:(BOOL)isPrerender { - (void)setIsPrerenderTab:(BOOL)isPrerender {
if (_isPrerenderTab == isPrerender) if (_isPrerenderTab == isPrerender)
return; return;
_isPrerenderTab = isPrerender; _isPrerenderTab = isPrerender;
self.webState->SetShouldSuppressDialogs(isPrerender && self.webState->SetShouldSuppressDialogs(isPrerender);
!isLinkLoadingPrerenderTab_);
if (_isPrerenderTab) if (_isPrerenderTab)
return; return;
...@@ -1164,7 +1157,7 @@ void TabInfoBarObserver::OnInfoBarReplaced(infobars::InfoBar* old_infobar, ...@@ -1164,7 +1157,7 @@ void TabInfoBarObserver::OnInfoBarReplaced(infobars::InfoBar* old_infobar,
- (BOOL)webController:(CRWWebController*)webController - (BOOL)webController:(CRWWebController*)webController
shouldOpenExternalURL:(const GURL&)URL { shouldOpenExternalURL:(const GURL&)URL {
if (_isPrerenderTab && !isLinkLoadingPrerenderTab_) { if (_isPrerenderTab) {
[delegate_ discardPrerender]; [delegate_ discardPrerender];
return NO; return NO;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment