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

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

Issue 596543002: Remove WebContentsObserver::ProvisionalChangeToMainFrameUrl and all the code supporting it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@redirprerender
Patch Set: done Created 6 years, 3 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
« 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 2451 matching lines...) Expand 10 before | Expand all | Expand 10 after
2462 RenderFrameHostImpl* render_frame_host, 2462 RenderFrameHostImpl* render_frame_host,
2463 const GURL& validated_url, 2463 const GURL& validated_url,
2464 bool is_error_page, 2464 bool is_error_page,
2465 bool is_iframe_srcdoc) { 2465 bool is_iframe_srcdoc) {
2466 // Notify observers about the start of the provisional load. 2466 // Notify observers about the start of the provisional load.
2467 FOR_EACH_OBSERVER( 2467 FOR_EACH_OBSERVER(
2468 WebContentsObserver, 2468 WebContentsObserver,
2469 observers_, 2469 observers_,
2470 DidStartProvisionalLoadForFrame( 2470 DidStartProvisionalLoadForFrame(
2471 render_frame_host, validated_url, is_error_page, is_iframe_srcdoc)); 2471 render_frame_host, validated_url, is_error_page, is_iframe_srcdoc));
2472
2473 if (!render_frame_host->GetParent()) {
2474 FOR_EACH_OBSERVER(
2475 WebContentsObserver,
2476 observers_,
2477 ProvisionalChangeToMainFrameUrl(validated_url,
2478 render_frame_host));
2479 }
2480 } 2472 }
2481 2473
2482 void WebContentsImpl::DidStartNavigationTransition( 2474 void WebContentsImpl::DidStartNavigationTransition(
2483 RenderFrameHostImpl* render_frame_host) { 2475 RenderFrameHostImpl* render_frame_host) {
2484 #if defined(OS_ANDROID) 2476 #if defined(OS_ANDROID)
2485 int render_frame_id = render_frame_host->GetRoutingID(); 2477 int render_frame_id = render_frame_host->GetRoutingID();
2486 GetWebContentsAndroid()->DidStartNavigationTransitionForFrame( 2478 GetWebContentsAndroid()->DidStartNavigationTransitionForFrame(
2487 render_frame_id); 2479 render_frame_id);
2488 #endif 2480 #endif
2489 } 2481 }
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
2553 source_render_frame_id)); 2545 source_render_frame_id));
2554 } 2546 }
2555 } 2547 }
2556 2548
2557 bool WebContentsImpl::ShouldPreserveAbortedURLs() { 2549 bool WebContentsImpl::ShouldPreserveAbortedURLs() {
2558 if (!delegate_) 2550 if (!delegate_)
2559 return false; 2551 return false;
2560 return delegate_->ShouldPreserveAbortedURLs(this); 2552 return delegate_->ShouldPreserveAbortedURLs(this);
2561 } 2553 }
2562 2554
2563 void WebContentsImpl::DidRedirectProvisionalLoad(
2564 RenderFrameHostImpl* render_frame_host,
2565 const GURL& validated_target_url) {
2566 // Notify observers about the provisional change in the main frame URL.
2567 FOR_EACH_OBSERVER(
2568 WebContentsObserver,
2569 observers_,
2570 ProvisionalChangeToMainFrameUrl(validated_target_url,
2571 render_frame_host));
2572 }
2573
2574 void WebContentsImpl::DidCommitProvisionalLoad( 2555 void WebContentsImpl::DidCommitProvisionalLoad(
2575 RenderFrameHostImpl* render_frame_host, 2556 RenderFrameHostImpl* render_frame_host,
2576 const GURL& url, 2557 const GURL& url,
2577 ui::PageTransition transition_type) { 2558 ui::PageTransition transition_type) {
2578 // Notify observers about the commit of the provisional load. 2559 // Notify observers about the commit of the provisional load.
2579 FOR_EACH_OBSERVER(WebContentsObserver, 2560 FOR_EACH_OBSERVER(WebContentsObserver,
2580 observers_, 2561 observers_,
2581 DidCommitProvisionalLoadForFrame( 2562 DidCommitProvisionalLoadForFrame(
2582 render_frame_host, url, transition_type)); 2563 render_frame_host, url, transition_type));
2583 } 2564 }
(...skipping 1782 matching lines...) Expand 10 before | Expand all | Expand 10 after
4366 node->render_manager()->ResumeResponseDeferredAtStart(); 4347 node->render_manager()->ResumeResponseDeferredAtStart();
4367 } 4348 }
4368 4349
4369 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4350 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4370 force_disable_overscroll_content_ = force_disable; 4351 force_disable_overscroll_content_ = force_disable;
4371 if (view_) 4352 if (view_)
4372 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4353 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4373 } 4354 }
4374 4355
4375 } // namespace content 4356 } // 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