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 6627920e9cbf37542a887b480a8e354fde20375c..ea7d375a38f3842489cd3c5050d3f2a0acb2bf20 100644 |
| --- a/ios/chrome/browser/tabs/tab.mm |
| +++ b/ios/chrome/browser/tabs/tab.mm |
| @@ -1165,12 +1165,6 @@ - (void)loadSessionTab:(const sessions::SessionTab*)sessionTab { |
| currentIndex:sessionTab->current_navigation_index]; |
| } |
| -- (void)reload { |
| - // TODO(crbug.com/661671): Convert callers to go through CRWWebController |
| - // directly and remove this passthrough method. |
| - [self.webController reload]; |
| -} |
| - |
| - (void)webWillReload { |
| if ([parentTabModel_ tabUsageRecorder]) { |
| [parentTabModel_ tabUsageRecorder]->RecordReload(self); |
| @@ -1465,7 +1459,8 @@ - (void)countMainFrameLoad { |
| - (void)applicationDidBecomeActive { |
| if (requireReloadAfterBecomingActive_) { |
| if (visible_) { |
| - [self.webController reload]; |
| + self.navigationManager->Reload(web::ReloadType::NORMAL, |
| + false /* check_for_repost */); |
| } else { |
| [self.webController requirePageReload]; |
| } |
| @@ -2004,7 +1999,8 @@ - (void)renderProcessGoneForWebState:(web::WebState*)webState { |
| base::scoped_nsobject<SadTabView> sadTabView( |
| [[SadTabView alloc] initWithReloadHandler:^{ |
| base::scoped_nsobject<Tab> strongSelf([weakSelf retain]); |
| - [strongSelf reload]; |
| + [strongSelf navigationManager]->Reload( |
| + web::ReloadType::NORMAL, false /* check_for_repost */); |
|
Eugene But (OOO till 7-30)
2017/03/16 17:17:47
This is called from SadTab and explicitly initiate
liaoyuke
2017/03/16 18:10:42
Done.
|
| }]); |
| base::scoped_nsobject<CRWContentView> contentView( |
| [[CRWGenericContentView alloc] initWithView:sadTabView]); |