Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Unified Diff: ios/chrome/browser/tabs/tab.mm

Issue 2969273002: Cleaned up webWillAddPendingURL:transition: callback. (Closed)
Patch Set: Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/tabs/tab.mm
diff --git a/ios/chrome/browser/tabs/tab.mm b/ios/chrome/browser/tabs/tab.mm
index 7ca80f6123234cc671ae045d0da5c207426d668e..97b0279ccf0660a6b2b258e416412ebb01bb4377 100644
--- a/ios/chrome/browser/tabs/tab.mm
+++ b/ios/chrome/browser/tabs/tab.mm
@@ -1339,9 +1339,6 @@ void TabInfoBarObserver::OnInfoBarReplaced(infobars::InfoBar* old_infobar,
DCHECK(self.webController.loadPhase == web::LOAD_REQUESTED);
DCHECK([self navigationManager]);
- // Move the toolbar to visible during page load.
- [_fullScreenController disableFullScreen];
-
BOOL isUserNavigationEvent =
(transition & ui::PAGE_TRANSITION_IS_REDIRECT_MASK) == 0;
// Check for link-follow clobbers. These are changes where there is no
@@ -1371,6 +1368,11 @@ void TabInfoBarObserver::OnInfoBarReplaced(infobars::InfoBar* old_infobar,
[_parentTabModel tabUsageRecorder]->RecordReload(self);
}
+ // Move the toolbar to visible during page load.
+ // TODO(crbug.com/707305): Do not disable fullscreen for same-document
+ // navigations.
+ [_fullScreenController disableFullScreen];
+
[self.dialogDelegate cancelDialogForTab:self];
[_parentTabModel notifyTabChanged:self];
[_openInController disable];
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698