Index: content/browser/web_contents/web_contents_impl.cc |
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
index 507ebbe57de5de78422bdf86c398e0b70c9e7e00..ae37a0959d13c01621ff6ee8b04b139581bd6043 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -2541,6 +2541,17 @@ void WebContentsImpl::DidStartProvisionalLoad( |
observers_, |
DidStartProvisionalLoadForFrame( |
render_frame_host, validated_url, is_error_page, is_iframe_srcdoc)); |
+ |
+ // Notify accessibility if this is a reload. |
+ NavigationEntry* entry = controller_.GetVisibleEntry(); |
+ if (entry && ui::PageTransitionCoreTypeIs( |
+ entry->GetTransitionType(), ui::PAGE_TRANSITION_RELOAD)) { |
+ FrameTreeNode* ftn = render_frame_host->frame_tree_node(); |
+ BrowserAccessibilityManager* manager = |
+ ftn->current_frame_host()->browser_accessibility_manager(); |
+ if (manager) |
+ manager->UserIsReloading(); |
+ } |
} |
void WebContentsImpl::DidStartNavigationTransition( |
@@ -2562,6 +2573,11 @@ void WebContentsImpl::DidFailProvisionalLoadWithError( |
validated_url, |
params.error_code, |
params.error_description)); |
+ |
+ BrowserAccessibilityManager* manager = |
+ render_frame_host->browser_accessibility_manager(); |
nasko
2015/02/04 21:12:08
Don't you need the same code as above to get the m
dmazzoni
2015/02/04 22:23:10
Good catch, thanks.
|
+ if (manager) |
+ manager->NavigationFailed(); |
} |
void WebContentsImpl::DidFailLoadWithError( |
@@ -2637,6 +2653,11 @@ void WebContentsImpl::DidCommitProvisionalLoad( |
observers_, |
DidCommitProvisionalLoadForFrame( |
render_frame_host, url, transition_type)); |
+ |
+ BrowserAccessibilityManager* manager = |
+ render_frame_host->browser_accessibility_manager(); |
nasko
2015/02/04 21:12:08
This however should be fine, as we have committed
|
+ if (manager) |
+ manager->NavigationSucceeded(); |
} |
void WebContentsImpl::DidNavigateMainFramePreCommit( |
@@ -3808,6 +3829,16 @@ void WebContentsImpl::DidStartLoading(RenderFrameHost* render_frame_host, |
bool to_different_document) { |
SetIsLoading(render_frame_host->GetRenderViewHost(), true, |
to_different_document, NULL); |
+ |
+ // Notify accessibility that the user is navigating away from the |
+ // current RenderFrameHost. TODO(dmazzoni): do this using a |
nasko
2015/02/04 21:12:08
It needn't navigate away from the current RFH. It
dmazzoni
2015/02/04 22:23:10
Done.
|
+ // WebContentsObserver in a future refactoring. |
+ FrameTreeNode* ftn = static_cast<RenderFrameHostImpl*>(render_frame_host)-> |
+ frame_tree_node(); |
+ BrowserAccessibilityManager* manager = |
+ ftn->current_frame_host()->browser_accessibility_manager(); |
+ if (manager) |
+ manager->UserIsNavigatingAway(); |
} |
void WebContentsImpl::DidStopLoading(RenderFrameHost* render_frame_host) { |