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 4f586b25a365809c32a46dcda2b3a0da7f966b93..d3f5df16b30651e529336bbfe9557bed489bfe89 100644 |
| --- a/ios/chrome/browser/ui/browser_view_controller.mm |
| +++ b/ios/chrome/browser/ui/browser_view_controller.mm |
| @@ -1095,12 +1095,19 @@ - (BOOL)canShowFindBar { |
| web::WebState* webState = [_model currentTab].webState; |
| if (!webState) |
| return web::UserAgentType::NONE; |
| - web::NavigationItem* visibleItem = |
| - webState->GetNavigationManager()->GetVisibleItem(); |
| - if (!visibleItem) |
| + |
| + web::NavigationItem* item = nullptr; |
|
Eugene But (OOO till 7-30)
2017/03/30 23:01:49
ditto
liaoyuke
2017/03/31 15:50:12
Done.
|
| + if (webState->GetNavigationManager()->GetTransientItem()) |
| + item = webState->GetNavigationManager()->GetTransientItem(); |
| + else if (webState->GetNavigationManager()->GetPendingItem()) |
| + item = webState->GetNavigationManager()->GetPendingItem(); |
| + else if (webState->GetNavigationManager()->GetLastCommittedItem()) |
| + item = webState->GetNavigationManager()->GetLastCommittedItem(); |
|
Eugene But (OOO till 7-30)
2017/03/30 23:01:49
Copying this logic everywhere is quite error prone
liaoyuke
2017/03/31 15:50:12
Acknowledged.
|
| + |
| + if (!item) |
| return web::UserAgentType::NONE; |
| - return visibleItem->GetUserAgentType(); |
| + return item->GetUserAgentType(); |
| } |
| - (void)setVisible:(BOOL)visible { |