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

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

Issue 689123003: Revert of Navigation transitions (web to native app): Pass data after starting provisional load ... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
« 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 2438 matching lines...) Expand 10 before | Expand all | Expand 10 after
2449 bool is_iframe_srcdoc) { 2449 bool is_iframe_srcdoc) {
2450 // Notify observers about the start of the provisional load. 2450 // Notify observers about the start of the provisional load.
2451 FOR_EACH_OBSERVER( 2451 FOR_EACH_OBSERVER(
2452 WebContentsObserver, 2452 WebContentsObserver,
2453 observers_, 2453 observers_,
2454 DidStartProvisionalLoadForFrame( 2454 DidStartProvisionalLoadForFrame(
2455 render_frame_host, validated_url, is_error_page, is_iframe_srcdoc)); 2455 render_frame_host, validated_url, is_error_page, is_iframe_srcdoc));
2456 } 2456 }
2457 2457
2458 void WebContentsImpl::DidStartNavigationTransition( 2458 void WebContentsImpl::DidStartNavigationTransition(
2459 RenderFrameHostImpl* render_frame_host, 2459 RenderFrameHostImpl* render_frame_host) {
2460 const TransitionLayerData& transition_data) {
2461 #if defined(OS_ANDROID) 2460 #if defined(OS_ANDROID)
2462 int render_frame_id = render_frame_host->GetRoutingID(); 2461 int render_frame_id = render_frame_host->GetRoutingID();
2463 GetWebContentsAndroid()->DidStartNavigationTransitionForFrame( 2462 GetWebContentsAndroid()->DidStartNavigationTransitionForFrame(
2464 render_frame_id, transition_data); 2463 render_frame_id);
2465 #endif 2464 #endif
2466 } 2465 }
2467 2466
2468 void WebContentsImpl::DidFailProvisionalLoadWithError( 2467 void WebContentsImpl::DidFailProvisionalLoadWithError(
2469 RenderFrameHostImpl* render_frame_host, 2468 RenderFrameHostImpl* render_frame_host,
2470 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { 2469 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) {
2471 GURL validated_url(params.url); 2470 GURL validated_url(params.url);
2472 FOR_EACH_OBSERVER(WebContentsObserver, 2471 FOR_EACH_OBSERVER(WebContentsObserver,
2473 observers_, 2472 observers_,
2474 DidFailProvisionalLoad(render_frame_host, 2473 DidFailProvisionalLoad(render_frame_host,
(...skipping 1855 matching lines...) Expand 10 before | Expand all | Expand 10 after
4330 node->render_manager()->ResumeResponseDeferredAtStart(); 4329 node->render_manager()->ResumeResponseDeferredAtStart();
4331 } 4330 }
4332 4331
4333 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4332 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4334 force_disable_overscroll_content_ = force_disable; 4333 force_disable_overscroll_content_ = force_disable;
4335 if (view_) 4334 if (view_)
4336 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4335 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4337 } 4336 }
4338 4337
4339 } // namespace content 4338 } // 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