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

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 1144463003: Remove Navigation Transitions from Chromium (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed TransitionPageHelper. Created 5 years, 7 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/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 9929fa143cba1ea368dc66288fbb2ce07498793a..935a9cf3a16031b0946842d400212f0beab740f6 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -39,7 +39,6 @@
#include "content/browser/renderer_host/render_view_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
-#include "content/browser/transition_request_manager.h"
#include "content/common/accessibility_messages.h"
#include "content/common/frame_messages.h"
#include "content/common/input_messages.h"
@@ -758,11 +757,9 @@ void RenderFrameHostImpl::OnDocumentOnLoadCompleted(
delegate_->DocumentOnLoadCompleted(this);
}
-void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame(
- const GURL& url,
- bool is_transition_navigation) {
+void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame(const GURL& url) {
frame_tree_node_->navigator()->DidStartProvisionalLoad(
- this, url, is_transition_navigation);
+ this, url);
}
void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
@@ -934,18 +931,6 @@ void RenderFrameHostImpl::OnCrossSiteResponse(
should_replace_current_entry);
}
-void RenderFrameHostImpl::OnDeferredAfterResponseStarted(
- const GlobalRequestID& global_request_id,
- const TransitionLayerData& transition_data) {
- frame_tree_node_->render_manager()->OnDeferredAfterResponseStarted(
- global_request_id, this);
-
- if (GetParent() || !delegate_->WillHandleDeferAfterResponseStarted())
- frame_tree_node_->render_manager()->ResumeResponseDeferredAtStart();
- else
- delegate_->DidDeferAfterResponseStarted(transition_data);
-}
-
void RenderFrameHostImpl::SwapOut(
RenderFrameProxyHost* proxy,
bool is_loading) {
@@ -2007,17 +1992,6 @@ void RenderFrameHostImpl::DidCancelPopupMenu() {
#endif
-void RenderFrameHostImpl::ClearPendingTransitionRequestData() {
- BrowserThread::PostTask(
- BrowserThread::IO,
- FROM_HERE,
- base::Bind(
- &TransitionRequestManager::ClearPendingTransitionRequestData,
- base::Unretained(TransitionRequestManager::GetInstance()),
- GetProcess()->GetID(),
- routing_id_));
-}
-
void RenderFrameHostImpl::SetNavigationsSuspended(
bool suspend,
const base::TimeTicks& proceed_time) {
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | content/browser/frame_host/render_frame_host_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698