Chromium Code Reviews| Index: ios/chrome/browser/ui/browser_view_controller.mm |
| diff --git a/ios/chrome/browser/ui/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view_controller.mm |
| index 83513d14823aefbee845c27c18342b1700d6507d..b34e9ee485f828b3f428a87abff60136879dd1a8 100644 |
| --- a/ios/chrome/browser/ui/browser_view_controller.mm |
| +++ b/ios/chrome/browser/ui/browser_view_controller.mm |
| @@ -172,7 +172,6 @@ |
| #include "ios/public/provider/chrome/browser/voice/voice_search_controller.h" |
| #include "ios/public/provider/chrome/browser/voice/voice_search_controller_delegate.h" |
| #include "ios/public/provider/chrome/browser/voice/voice_search_provider.h" |
| -#import "ios/web/navigation/crw_session_controller.h" |
| #include "ios/web/navigation/navigation_manager_impl.h" |
| #include "ios/web/public/active_state_manager.h" |
| #include "ios/web/public/navigation_item.h" |
| @@ -2418,7 +2417,7 @@ - (void)closeWebState:(web::WebState*)webState { |
| // Only allow a web page to close itself if it was opened by DOM, or if there |
| // are no navigation items. |
| Tab* tab = LegacyTabHelper::GetTabForWebState(webState); |
| - DCHECK([[tab navigationManagerImpl]->GetSessionController() isOpenedByDOM] || |
| + DCHECK(webState && webState->HasOpener() || |
|
Eugene But (OOO till 7-30)
2017/03/18 00:33:30
nit: Consider dropping |webState && | it's still g
kkhorimoto
2017/03/20 22:39:20
Done.
|
| ![tab navigationManager]->GetItemCount()); |
| if (![self tabModel]) |