OLD | NEW |
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 2324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2335 | 2335 |
2336 if (!render_frame_host->GetParent()) { | 2336 if (!render_frame_host->GetParent()) { |
2337 FOR_EACH_OBSERVER( | 2337 FOR_EACH_OBSERVER( |
2338 WebContentsObserver, | 2338 WebContentsObserver, |
2339 observers_, | 2339 observers_, |
2340 ProvisionalChangeToMainFrameUrl(validated_url, | 2340 ProvisionalChangeToMainFrameUrl(validated_url, |
2341 render_frame_host)); | 2341 render_frame_host)); |
2342 } | 2342 } |
2343 } | 2343 } |
2344 | 2344 |
| 2345 void WebContentsImpl::DidStartNavigationTransition( |
| 2346 RenderFrameHostImpl* render_frame_host) { |
| 2347 #if defined(OS_ANDROID) |
| 2348 int render_frame_id = render_frame_host->GetRoutingID(); |
| 2349 ContentViewCoreImpl::FromWebContents(this)-> |
| 2350 DidStartNavigationTransitionForFrame(render_frame_id); |
| 2351 #endif |
| 2352 } |
| 2353 |
2345 void WebContentsImpl::DidFailProvisionalLoadWithError( | 2354 void WebContentsImpl::DidFailProvisionalLoadWithError( |
2346 RenderFrameHostImpl* render_frame_host, | 2355 RenderFrameHostImpl* render_frame_host, |
2347 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { | 2356 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { |
2348 GURL validated_url(params.url); | 2357 GURL validated_url(params.url); |
2349 FOR_EACH_OBSERVER(WebContentsObserver, | 2358 FOR_EACH_OBSERVER(WebContentsObserver, |
2350 observers_, | 2359 observers_, |
2351 DidFailProvisionalLoad(render_frame_host, | 2360 DidFailProvisionalLoad(render_frame_host, |
2352 validated_url, | 2361 validated_url, |
2353 params.error_code, | 2362 params.error_code, |
2354 params.error_description)); | 2363 params.error_description)); |
(...skipping 1783 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4138 if (new_size != old_size) | 4147 if (new_size != old_size) |
4139 delegate_->UpdatePreferredSize(this, new_size); | 4148 delegate_->UpdatePreferredSize(this, new_size); |
4140 } | 4149 } |
4141 | 4150 |
4142 void WebContentsImpl::ResumeResponseDeferredAtStart() { | 4151 void WebContentsImpl::ResumeResponseDeferredAtStart() { |
4143 FrameTreeNode* node = frame_tree_.root(); | 4152 FrameTreeNode* node = frame_tree_.root(); |
4144 node->render_manager()->ResumeResponseDeferredAtStart(); | 4153 node->render_manager()->ResumeResponseDeferredAtStart(); |
4145 } | 4154 } |
4146 | 4155 |
4147 } // namespace content | 4156 } // namespace content |
OLD | NEW |