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

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

Issue 868673002: OOPIF: report both original and destination rfh in AboutToNavigateRenderFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebaselined Created 5 years, 11 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
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 2542 matching lines...) Expand 10 before | Expand all | Expand 10 after
2553 observers_, 2553 observers_,
2554 DidFailLoad(render_frame_host, url, error_code, error_description)); 2554 DidFailLoad(render_frame_host, url, error_code, error_description));
2555 } 2555 }
2556 2556
2557 void WebContentsImpl::NotifyChangedNavigationState( 2557 void WebContentsImpl::NotifyChangedNavigationState(
2558 InvalidateTypes changed_flags) { 2558 InvalidateTypes changed_flags) {
2559 NotifyNavigationStateChanged(changed_flags); 2559 NotifyNavigationStateChanged(changed_flags);
2560 } 2560 }
2561 2561
2562 void WebContentsImpl::AboutToNavigateRenderFrame( 2562 void WebContentsImpl::AboutToNavigateRenderFrame(
2563 RenderFrameHostImpl* render_frame_host) { 2563 RenderFrameHostImpl* old_host,
2564 RenderFrameHostImpl* new_host) {
2564 // Notify observers that we will navigate in this RenderFrame. 2565 // Notify observers that we will navigate in this RenderFrame.
2565 FOR_EACH_OBSERVER( 2566 FOR_EACH_OBSERVER(
2566 WebContentsObserver, 2567 WebContentsObserver,
2567 observers_, 2568 observers_,
2568 AboutToNavigateRenderFrame(render_frame_host)); 2569 AboutToNavigateRenderFrame(old_host, new_host));
2569 } 2570 }
2570 2571
2571 void WebContentsImpl::DidStartNavigationToPendingEntry( 2572 void WebContentsImpl::DidStartNavigationToPendingEntry(
2572 RenderFrameHostImpl* render_frame_host, 2573 RenderFrameHostImpl* render_frame_host,
2573 const GURL& url, 2574 const GURL& url,
2574 NavigationController::ReloadType reload_type) { 2575 NavigationController::ReloadType reload_type) {
2575 // Notify observers about navigation. 2576 // Notify observers about navigation.
2576 FOR_EACH_OBSERVER( 2577 FOR_EACH_OBSERVER(
2577 WebContentsObserver, 2578 WebContentsObserver,
2578 observers_, 2579 observers_,
(...skipping 1870 matching lines...) Expand 10 before | Expand all | Expand 10 after
4449 node->render_manager()->ResumeResponseDeferredAtStart(); 4450 node->render_manager()->ResumeResponseDeferredAtStart();
4450 } 4451 }
4451 4452
4452 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4453 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4453 force_disable_overscroll_content_ = force_disable; 4454 force_disable_overscroll_content_ = force_disable;
4454 if (view_) 4455 if (view_)
4455 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4456 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4456 } 4457 }
4457 4458
4458 } // namespace content 4459 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/public/browser/web_contents_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698