Chromium Code Reviews| 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..d6d50234183cc1cef80f0395ec2b463e2de65fd8 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" |
| +#include "ios/chrome/browser/web/navigation_manager_util.h" |
|
Eugene But (OOO till 7-30)
2017/03/17 14:32:04
s/include/import
pkl (ping after 24h if needed)
2017/03/17 20:23:52
Done.
|
| #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,16 +1509,16 @@ 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]; |
| + web::NavigationItem* lastUserItem = |
|
Eugene But (OOO till 7-30)
2017/03/17 14:32:04
nit: s/lastUserItem/lastNonRedirectedItem ?
pkl (ping after 24h if needed)
2017/03/17 20:23:52
Done.
|
| + GetLastNonRedirectedItem([self navigationManager]); |
| if (!lastUserItem) |
| return; |
| // |originalUrl| will be empty if a page was open by DOM. |
| GURL reloadURL(lastUserItem->GetOriginalRequestURL()); |
| if (reloadURL.is_empty()) { |
| - DCHECK(sessionController.openedByDOM); |
| + DCHECK( |
| + [[self navigationManagerImpl]->GetSessionController() isOpenedByDOM]); |
| reloadURL = lastUserItem->GetVirtualURL(); |
| } |