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

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

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

Powered by Google App Engine
This is Rietveld 408576698