Commit 2002f254 authored by Eugene But's avatar Eugene But Committed by Commit Bot

Do not use LoadCommittedDetails.item in InfoBarManagerImpl.

NavigationItemCommitted is deprecated in favour of DidFinishNavigation.
This change will simplify transition from NavigationItemCommitted to
DidFinishNavigation, because DidFinishNavigation does not pass
NavigationItem as argument.

Bug: 720786
Change-Id: Ic71f49c687aa73957afc0033910dd028a2f942e9
Reviewed-on: https://chromium-review.googlesource.com/c/1356772
Commit-Queue: Eugene But <eugenebut@chromium.org>
Reviewed-by: default avatarSergio Collazos <sczs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#613176}
parent c1f7f028
...@@ -23,15 +23,16 @@ ...@@ -23,15 +23,16 @@
namespace { namespace {
infobars::InfoBarDelegate::NavigationDetails infobars::InfoBarDelegate::NavigationDetails CreateNavigationDetails(
NavigationDetailsFromLoadCommittedDetails( web::NavigationItem* navigation_item,
const web::LoadCommittedDetails& load_details) { bool is_in_page) {
infobars::InfoBarDelegate::NavigationDetails navigation_details; infobars::InfoBarDelegate::NavigationDetails navigation_details;
navigation_details.entry_id = load_details.item->GetUniqueID(); navigation_details.entry_id = navigation_item->GetUniqueID();
const ui::PageTransition transition = load_details.item->GetTransitionType(); const ui::PageTransition transition = navigation_item->GetTransitionType();
navigation_details.is_navigation_to_different_page = navigation_details.is_navigation_to_different_page =
ui::PageTransitionIsMainFrame(transition) && !load_details.is_in_page; ui::PageTransitionIsMainFrame(transition) && !is_in_page;
// web::LoadCommittedDetails doesn't store this information, default to false. // Default to false, since iOS callbacks do not specify if navigation was a
// repace state navigation .
navigation_details.did_replace_entry = false; navigation_details.did_replace_entry = false;
navigation_details.is_reload = navigation_details.is_reload =
ui::PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_RELOAD); ui::PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_RELOAD);
...@@ -74,7 +75,9 @@ void InfoBarManagerImpl::NavigationItemCommitted( ...@@ -74,7 +75,9 @@ void InfoBarManagerImpl::NavigationItemCommitted(
web::WebState* web_state, web::WebState* web_state,
const web::LoadCommittedDetails& load_details) { const web::LoadCommittedDetails& load_details) {
DCHECK_EQ(web_state_, web_state); DCHECK_EQ(web_state_, web_state);
OnNavigation(NavigationDetailsFromLoadCommittedDetails(load_details)); OnNavigation(CreateNavigationDetails(
web_state->GetNavigationManager()->GetLastCommittedItem(),
load_details.is_in_page));
} }
void InfoBarManagerImpl::WebStateDestroyed(web::WebState* web_state) { void InfoBarManagerImpl::WebStateDestroyed(web::WebState* web_state) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment