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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 358973005: Navigation transitions: Pass is_transition_navigation flag up to the embedder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 2338 matching lines...) Expand 10 before | Expand all | Expand 10 after
2349 2349
2350 if (is_main_frame) { 2350 if (is_main_frame) {
2351 FOR_EACH_OBSERVER( 2351 FOR_EACH_OBSERVER(
2352 WebContentsObserver, 2352 WebContentsObserver,
2353 observers_, 2353 observers_,
2354 ProvisionalChangeToMainFrameUrl(validated_url, 2354 ProvisionalChangeToMainFrameUrl(validated_url,
2355 render_frame_host)); 2355 render_frame_host));
2356 } 2356 }
2357 } 2357 }
2358 2358
2359 void WebContentsImpl::DidStartNavigationTransition(
2360 RenderFrameHostImpl* render_frame_host) {
2361 #if defined(OS_ANDROID)
2362 int render_frame_id = render_frame_host->GetRoutingID();
2363 ContentViewCoreImpl::FromWebContents(this)->
2364 DidStartNavigationTransitionForFrame(render_frame_id);
2365 #endif
2366 }
2367
2359 void WebContentsImpl::DidFailProvisionalLoadWithError( 2368 void WebContentsImpl::DidFailProvisionalLoadWithError(
2360 RenderFrameHostImpl* render_frame_host, 2369 RenderFrameHostImpl* render_frame_host,
2361 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { 2370 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) {
2362 GURL validated_url(params.url); 2371 GURL validated_url(params.url);
2363 int render_frame_id = render_frame_host->GetRoutingID(); 2372 int render_frame_id = render_frame_host->GetRoutingID();
2364 bool is_main_frame = render_frame_host->frame_tree_node()->IsMainFrame(); 2373 bool is_main_frame = render_frame_host->frame_tree_node()->IsMainFrame();
2365 RenderViewHost* render_view_host = render_frame_host->render_view_host(); 2374 RenderViewHost* render_view_host = render_frame_host->render_view_host();
2366 FOR_EACH_OBSERVER( 2375 FOR_EACH_OBSERVER(
2367 WebContentsObserver, 2376 WebContentsObserver,
2368 observers_, 2377 observers_,
(...skipping 1773 matching lines...) Expand 10 before | Expand all | Expand 10 after
4142 if (new_size != old_size) 4151 if (new_size != old_size)
4143 delegate_->UpdatePreferredSize(this, new_size); 4152 delegate_->UpdatePreferredSize(this, new_size);
4144 } 4153 }
4145 4154
4146 void WebContentsImpl::ResumeResponseDeferredAtStart() { 4155 void WebContentsImpl::ResumeResponseDeferredAtStart() {
4147 FrameTreeNode* node = frame_tree_.root(); 4156 FrameTreeNode* node = frame_tree_.root();
4148 node->render_manager()->ResumeResponseDeferredAtStart(); 4157 node->render_manager()->ResumeResponseDeferredAtStart();
4149 } 4158 }
4150 4159
4151 } // namespace content 4160 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698