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

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

Issue 2756483006: Adds NavigationManager util functions to ios/chrome/browser/web/ (Closed)
Patch Set: changed #include to #import and minor renaming. Created 3 years, 9 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 | ios/chrome/browser/web/BUILD.gn » ('j') | 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 7cbcff399c1da0581aadd62b0a1a1e515e391eaa..5d9605d413129d671a670060cbcd1166e1da1cb8 100644
--- a/ios/chrome/browser/tabs/tab.mm
+++ b/ios/chrome/browser/tabs/tab.mm
@@ -105,6 +105,7 @@
#include "ios/chrome/browser/ui/ui_util.h"
#import "ios/chrome/browser/web/auto_reload_bridge.h"
#import "ios/chrome/browser/web/external_app_launcher.h"
+#import "ios/chrome/browser/web/navigation_manager_util.h"
#import "ios/chrome/browser/web/passkit_dialog_provider.h"
#include "ios/chrome/browser/web/print_observer.h"
#import "ios/chrome/browser/xcallback_parameters.h"
@@ -1508,21 +1509,21 @@ void TabInfoBarObserver::OnInfoBarReplaced(infobars::InfoBar* old_infobar,
ui::PageTransition transition =
ui::PageTransitionFromInt(ui::PAGE_TRANSITION_FORM_SUBMIT);
DCHECK([self navigationManager]);
- CRWSessionController* sessionController =
- [self navigationManagerImpl]->GetSessionController();
- web::NavigationItem* lastUserItem = [sessionController lastUserItem];
- if (!lastUserItem)
+ web::NavigationItem* lastNonRedirectedItem =
+ GetLastNonRedirectedItem([self navigationManager]);
+ if (!lastNonRedirectedItem)
return;
// |originalUrl| will be empty if a page was open by DOM.
- GURL reloadURL(lastUserItem->GetOriginalRequestURL());
+ GURL reloadURL(lastNonRedirectedItem->GetOriginalRequestURL());
if (reloadURL.is_empty()) {
- DCHECK(sessionController.openedByDOM);
- reloadURL = lastUserItem->GetVirtualURL();
+ DCHECK(
+ [[self navigationManagerImpl]->GetSessionController() isOpenedByDOM]);
+ reloadURL = lastNonRedirectedItem->GetVirtualURL();
}
web::NavigationManager::WebLoadParams params(reloadURL);
- params.referrer = lastUserItem->GetReferrer();
+ params.referrer = lastNonRedirectedItem->GetReferrer();
params.transition_type = transition;
if (self.navigationManager)
self.navigationManager->LoadURLWithParams(params);
« no previous file with comments | « no previous file | ios/chrome/browser/web/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698