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

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

Issue 1269813002: Add a NavigationThrottle to the public content/ interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@navigation-api
Patch Set: Created 5 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
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/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 2778 matching lines...) Expand 10 before | Expand all | Expand 10 after
2789 void WebContentsImpl::DidCommitNavigation(NavigationHandle* navigation_handle) { 2789 void WebContentsImpl::DidCommitNavigation(NavigationHandle* navigation_handle) {
2790 FOR_EACH_OBSERVER(WebContentsObserver, observers_, 2790 FOR_EACH_OBSERVER(WebContentsObserver, observers_,
2791 DidCommitNavigation(navigation_handle)); 2791 DidCommitNavigation(navigation_handle));
2792 } 2792 }
2793 2793
2794 void WebContentsImpl::DidFinishNavigation(NavigationHandle* navigation_handle) { 2794 void WebContentsImpl::DidFinishNavigation(NavigationHandle* navigation_handle) {
2795 FOR_EACH_OBSERVER(WebContentsObserver, observers_, 2795 FOR_EACH_OBSERVER(WebContentsObserver, observers_,
2796 DidFinishNavigation(navigation_handle)); 2796 DidFinishNavigation(navigation_handle));
2797 } 2797 }
2798 2798
2799 void WebContentsImpl::AddNavigationThrottles(
2800 NavigationHandle* navigation_handle) {
2801 GetContentClient()->browser()->AddNavigationThrottles(navigation_handle,
2802 this);
2803 }
2804
2799 void WebContentsImpl::DidStartProvisionalLoad( 2805 void WebContentsImpl::DidStartProvisionalLoad(
2800 RenderFrameHostImpl* render_frame_host, 2806 RenderFrameHostImpl* render_frame_host,
2801 const GURL& validated_url, 2807 const GURL& validated_url,
2802 bool is_error_page, 2808 bool is_error_page,
2803 bool is_iframe_srcdoc) { 2809 bool is_iframe_srcdoc) {
2804 // Notify observers about the start of the provisional load. 2810 // Notify observers about the start of the provisional load.
2805 FOR_EACH_OBSERVER( 2811 FOR_EACH_OBSERVER(
2806 WebContentsObserver, 2812 WebContentsObserver,
2807 observers_, 2813 observers_,
2808 DidStartProvisionalLoadForFrame( 2814 DidStartProvisionalLoadForFrame(
(...skipping 1806 matching lines...) Expand 10 before | Expand all | Expand 10 after
4615 player_map->erase(it); 4621 player_map->erase(it);
4616 } 4622 }
4617 4623
4618 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4624 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4619 force_disable_overscroll_content_ = force_disable; 4625 force_disable_overscroll_content_ = force_disable;
4620 if (view_) 4626 if (view_)
4621 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4627 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4622 } 4628 }
4623 4629
4624 } // namespace content 4630 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698