Cleanup WebToolbarDelegate
WebToolbarDelegate has a bunch of not used methods and method that
does not belong in it.
This CL cleans it and removes the dependency of the incognito panel on
it.
Bug: 708319
Change-Id: Iea84ab8d15eadaebabe1c4856d02d3dd39606f76
Reviewed-on: https://chromium-review.googlesource.com/649652
Commit-Queue: Gauthier Ambard <[email protected]>
Reviewed-by: Mark Cogan <[email protected]>
Cr-Commit-Position: refs/heads/master@{#499960}diff --git a/ios/chrome/browser/ui/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view_controller.mm
index 525b21e..f333bba 100644
--- a/ios/chrome/browser/ui/browser_view_controller.mm
+++ b/ios/chrome/browser/ui/browser_view_controller.mm
@@ -134,6 +134,7 @@
#import "ios/chrome/browser/ui/history_popup/requirements/tab_history_presentation.h"
#import "ios/chrome/browser/ui/history_popup/tab_history_legacy_coordinator.h"
#import "ios/chrome/browser/ui/key_commands_provider.h"
+#import "ios/chrome/browser/ui/ntp/incognito_panel_controller.h"
#import "ios/chrome/browser/ui/ntp/modal_ntp.h"
#import "ios/chrome/browser/ui/ntp/new_tab_page_controller.h"
#import "ios/chrome/browser/ui/ntp/recent_tabs/recent_tabs_handset_coordinator.h"
@@ -356,6 +357,7 @@
CRWWebStateDelegate,
DialogPresenterDelegate,
FullScreenControllerDelegate,
+ IncognitoViewControllerDelegate,
IOSCaptivePortalBlockingPageDelegate,
KeyCommandsPlumbing,
MFMailComposeViewControllerDelegate,
@@ -1740,9 +1742,7 @@
- (void)browserStateDestroyed {
[self setActive:NO];
- // Reset the toolbar opacity in case it was changed for contextual search.
- [self updateToolbarControlsAlpha:1.0];
- [self updateToolbarBackgroundAlpha:1.0];
+ [self setToolbarBackgroundAlpha:1.0];
[_paymentRequestManager close];
_paymentRequestManager = nil;
[_toolbarController browserStateDestroyed];
@@ -3271,7 +3271,7 @@
ntpObserver:self
browserState:_browserState
colorCache:_dominantColorCache
- webToolbarDelegate:self
+ toolbarDelegate:self
tabModel:_model
parentViewController:self
dispatcher:self.dispatcher];
@@ -3860,16 +3860,6 @@
return [[_model currentTab] webState];
}
-// This is called from within an animation block.
-- (void)toolbarHeightChanged {
- if ([self headerHeight] != 0) {
- // Ensure full screen height is updated.
- Tab* currentTab = [_model currentTab];
- BOOL visible = self.isToolbarOnScreen;
- [currentTab updateFullscreenWithToolbarVisible:visible];
- }
-}
-
// Load a new URL on a new page/tab.
- (void)webPageOrderedOpen:(const GURL&)URL
referrer:(const web::Referrer&)referrer
@@ -4001,22 +3991,10 @@
}
}
-- (IBAction)prepareToEnterTabSwitcher:(id)sender {
- [[_model currentTab] updateSnapshotWithOverlay:YES visibleFrameOnly:YES];
-}
-
- (ToolbarModelIOS*)toolbarModelIOS {
return _toolbarModelIOS.get();
}
-- (void)updateToolbarBackgroundAlpha:(CGFloat)alpha {
- [_toolbarController setBackgroundAlpha:alpha];
-}
-
-- (void)updateToolbarControlsAlpha:(CGFloat)alpha {
- [_toolbarController setControlsAlpha:alpha];
-}
-
- (void)willUpdateToolbarSnapshot {
[[_model currentTab].overscrollActionsController clear];
}
@@ -5092,6 +5070,12 @@
_rateThisAppDialog = nil;
}
+#pragma mark - IncognitoViewControllerDelegate
+
+- (void)setToolbarBackgroundAlpha:(CGFloat)alpha {
+ [_toolbarController setBackgroundAlpha:alpha];
+}
+
#pragma mark - VoiceSearchBarDelegate
- (BOOL)isTTSEnabledForVoiceSearchBar:(id<VoiceSearchBar>)voiceSearchBar {
