Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(307)

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 2684143002: Remove deprecated navigation callbacks on WebContentsObserver that are now unused. (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 30cc8989e92062def7bacd32f14c6e30c5107a27..1df61f68f4b59af1824ff78957fcc4a47ea30c9c 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3308,52 +3308,35 @@ void WebContentsImpl::ReadyToCommitNavigation(
NavigationHandle* navigation_handle) {
for (auto& observer : observers_)
observer.ReadyToCommitNavigation(navigation_handle);
-}
-
-void WebContentsImpl::DidFinishNavigation(NavigationHandle* navigation_handle) {
- for (auto& observer : observers_)
- observer.DidFinishNavigation(navigation_handle);
-}
-
-void WebContentsImpl::DidStartProvisionalLoad(
- RenderFrameHostImpl* render_frame_host,
- const GURL& validated_url,
- bool is_error_page) {
- // Notify observers about the start of the provisional load.
- for (auto& observer : observers_) {
- observer.DidStartProvisionalLoadForFrame(render_frame_host, validated_url,
- is_error_page);
- }
// Notify accessibility if this is a reload.
nasko 2017/02/10 19:44:58 This used to be at navigation start. This makes mo
jam 2017/02/10 20:00:34 I moved it because of the GetRenderFrameHost call,
dmazzoni 2017/02/10 20:47:45 BrowserAccessibilityManager::UserIsReloading() is
jam 2017/02/10 20:52:40 With a reload, we wouldn't be changing the RFH so
nasko 2017/02/10 21:28:39 This isn't quite correct, there are cases where th
jam1 2017/02/13 15:40:25 ok on second thought, I've maintainted the old beh
dmazzoni 2017/02/13 19:05:46 Digging in some more, the call to UserIsNavigating
- NavigationEntry* entry = controller_.GetVisibleEntry();
- if (entry && ui::PageTransitionCoreTypeIs(entry->GetTransitionType(),
- ui::PAGE_TRANSITION_RELOAD)) {
- FrameTreeNode* ftn = render_frame_host->frame_tree_node();
+ if (navigation_handle->GetReloadType() != ReloadType::NONE) {
BrowserAccessibilityManager* manager =
- ftn->current_frame_host()->browser_accessibility_manager();
+ static_cast<RenderFrameHostImpl*>(
+ navigation_handle->GetRenderFrameHost())
+ ->browser_accessibility_manager();
if (manager)
manager->UserIsReloading();
}
}
-void WebContentsImpl::DidFailProvisionalLoadWithError(
- RenderFrameHostImpl* render_frame_host,
- const GURL& validated_url,
- int error_code,
- const base::string16& error_description,
- bool was_ignored_by_handler) {
- for (auto& observer : observers_) {
- observer.DidFailProvisionalLoad(render_frame_host, validated_url,
- error_code, error_description,
- was_ignored_by_handler);
- }
+void WebContentsImpl::DidFinishNavigation(NavigationHandle* navigation_handle) {
+ for (auto& observer : observers_)
+ observer.DidFinishNavigation(navigation_handle);
- FrameTreeNode* ftn = render_frame_host->frame_tree_node();
- BrowserAccessibilityManager* manager =
- ftn->current_frame_host()->browser_accessibility_manager();
- if (manager)
- manager->NavigationFailed();
+ if (navigation_handle->HasCommitted()) {
+ BrowserAccessibilityManager* manager =
+ static_cast<RenderFrameHostImpl*>(
+ navigation_handle->GetRenderFrameHost())
+ ->browser_accessibility_manager();
+ if (manager) {
+ if (navigation_handle->IsErrorPage()) {
+ manager->NavigationFailed();
+ } else {
+ manager->NavigationSucceeded();
+ }
+ }
+ }
}
void WebContentsImpl::DidFailLoadWithError(
@@ -3411,22 +3394,6 @@ bool WebContentsImpl::ShouldPreserveAbortedURLs() {
return delegate_->ShouldPreserveAbortedURLs(this);
}
-void WebContentsImpl::DidCommitProvisionalLoad(
- RenderFrameHostImpl* render_frame_host,
- const GURL& url,
- ui::PageTransition transition_type) {
- // Notify observers about the commit of the provisional load.
- for (auto& observer : observers_) {
- observer.DidCommitProvisionalLoadForFrame(render_frame_host, url,
- transition_type);
- }
-
- BrowserAccessibilityManager* manager =
- render_frame_host->browser_accessibility_manager();
- if (manager)
- manager->NavigationSucceeded();
-}
-
void WebContentsImpl::DidNavigateMainFramePreCommit(
bool navigation_is_within_page) {
// Ensure fullscreen mode is exited before committing the navigation to a
@@ -3465,10 +3432,6 @@ void WebContentsImpl::DidNavigateMainFramePostCommit(
theme_color_ = SK_ColorTRANSPARENT;
}
- // Notify observers about navigation.
- for (auto& observer : observers_)
- observer.DidNavigateMainFrame(details, params);
-
if (delegate_)
delegate_->DidNavigateMainFramePostCommit(this);
view_->SetOverscrollControllerEnabled(CanOverscrollContent());
@@ -3491,10 +3454,6 @@ void WebContentsImpl::DidNavigateAnyFramePostCommit(
if (params.gesture == NavigationGestureUser && dialog_manager_) {
dialog_manager_->CancelDialogs(this, /*reset_state=*/true);
}
-
- // Notify observers about navigation.
- for (auto& observer : observers_)
- observer.DidNavigateAnyFrame(render_frame_host, details, params);
}
void WebContentsImpl::SetMainFrameMimeType(const std::string& mime_type) {

Powered by Google App Engine
This is Rietveld 408576698