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

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: Test fix Created 6 years, 4 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
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/common/frame_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2414 matching lines...) Expand 10 before | Expand all | Expand 10 after
2425 2425
2426 if (!render_frame_host->GetParent()) { 2426 if (!render_frame_host->GetParent()) {
2427 FOR_EACH_OBSERVER( 2427 FOR_EACH_OBSERVER(
2428 WebContentsObserver, 2428 WebContentsObserver,
2429 observers_, 2429 observers_,
2430 ProvisionalChangeToMainFrameUrl(validated_url, 2430 ProvisionalChangeToMainFrameUrl(validated_url,
2431 render_frame_host)); 2431 render_frame_host));
2432 } 2432 }
2433 } 2433 }
2434 2434
2435 void WebContentsImpl::DidStartNavigationTransition(
2436 RenderFrameHostImpl* render_frame_host) {
2437 #if defined(OS_ANDROID)
2438 int render_frame_id = render_frame_host->GetRoutingID();
2439 ContentViewCoreImpl::FromWebContents(this)->
2440 DidStartNavigationTransitionForFrame(render_frame_id);
2441 #endif
2442 }
2443
2435 void WebContentsImpl::DidFailProvisionalLoadWithError( 2444 void WebContentsImpl::DidFailProvisionalLoadWithError(
2436 RenderFrameHostImpl* render_frame_host, 2445 RenderFrameHostImpl* render_frame_host,
2437 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { 2446 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) {
2438 GURL validated_url(params.url); 2447 GURL validated_url(params.url);
2439 FOR_EACH_OBSERVER(WebContentsObserver, 2448 FOR_EACH_OBSERVER(WebContentsObserver,
2440 observers_, 2449 observers_,
2441 DidFailProvisionalLoad(render_frame_host, 2450 DidFailProvisionalLoad(render_frame_host,
2442 validated_url, 2451 validated_url,
2443 params.error_code, 2452 params.error_code,
2444 params.error_description)); 2453 params.error_description));
(...skipping 1791 matching lines...) Expand 10 before | Expand all | Expand 10 after
4236 if (new_size != old_size) 4245 if (new_size != old_size)
4237 delegate_->UpdatePreferredSize(this, new_size); 4246 delegate_->UpdatePreferredSize(this, new_size);
4238 } 4247 }
4239 4248
4240 void WebContentsImpl::ResumeResponseDeferredAtStart() { 4249 void WebContentsImpl::ResumeResponseDeferredAtStart() {
4241 FrameTreeNode* node = frame_tree_.root(); 4250 FrameTreeNode* node = frame_tree_.root();
4242 node->render_manager()->ResumeResponseDeferredAtStart(); 4251 node->render_manager()->ResumeResponseDeferredAtStart();
4243 } 4252 }
4244 4253
4245 } // namespace content 4254 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/common/frame_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698