diff options
13 files changed, 14 insertions, 2 deletions
diff --git a/android_webview/browser/renderer_host/aw_render_view_host_ext.cc b/android_webview/browser/renderer_host/aw_render_view_host_ext.cc index 0428baa..8428990 100644 --- a/android_webview/browser/renderer_host/aw_render_view_host_ext.cc +++ b/android_webview/browser/renderer_host/aw_render_view_host_ext.cc @@ -116,6 +116,7 @@ void AwRenderViewHostExt::RenderProcessGone(base::TerminationStatus status) { } void AwRenderViewHostExt::DidNavigateAnyFrame( + content::RenderFrameHost* render_frame_host, const content::LoadCommittedDetails& details, const content::FrameNavigateParams& params) { DCHECK(CalledOnValidThread()); diff --git a/android_webview/browser/renderer_host/aw_render_view_host_ext.h b/android_webview/browser/renderer_host/aw_render_view_host_ext.h index 8443f5f..4b6c7eb 100644 --- a/android_webview/browser/renderer_host/aw_render_view_host_ext.h +++ b/android_webview/browser/renderer_host/aw_render_view_host_ext.h @@ -82,6 +82,7 @@ class AwRenderViewHostExt : public content::WebContentsObserver, virtual void RenderViewCreated(content::RenderViewHost* view_host) override; virtual void RenderProcessGone(base::TerminationStatus status) override; virtual void DidNavigateAnyFrame( + content::RenderFrameHost* render_frame_host, const content::LoadCommittedDetails& details, const content::FrameNavigateParams& params) override; virtual bool OnMessageReceived(const IPC::Message& message) override; diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/history/history_tab_helper.cc index f0f7960..8a40bf4 100644 --- a/chrome/browser/history/history_tab_helper.cc +++ b/chrome/browser/history/history_tab_helper.cc @@ -84,6 +84,7 @@ void HistoryTabHelper::DidNavigateMainFrame( } void HistoryTabHelper::DidNavigateAnyFrame( + content::RenderFrameHost* render_frame_host, const content::LoadCommittedDetails& details, const content::FrameNavigateParams& params) { // Update history. Note that this needs to happen after the entry is complete, diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/history/history_tab_helper.h index c6372b4..8650051 100644 --- a/chrome/browser/history/history_tab_helper.h +++ b/chrome/browser/history/history_tab_helper.h @@ -47,6 +47,7 @@ class HistoryTabHelper : public content::WebContentsObserver, const content::LoadCommittedDetails& details, const content::FrameNavigateParams& params) OVERRIDE; virtual void DidNavigateAnyFrame( + content::RenderFrameHost* render_frame_host, const content::LoadCommittedDetails& details, const content::FrameNavigateParams& params) OVERRIDE; virtual void TitleWasSet(content::NavigationEntry* entry, diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 63a856d..6d96e23 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -605,6 +605,7 @@ class RedirectObserver : public content::WebContentsObserver { } virtual void DidNavigateAnyFrame( + content::RenderFrameHost* render_frame_host, const content::LoadCommittedDetails& details, const content::FrameNavigateParams& params) override { params_ = params; diff --git a/components/translate/content/browser/content_translate_driver.cc b/components/translate/content/browser/content_translate_driver.cc index ab86100..f2db0fb 100644 --- a/components/translate/content/browser/content_translate_driver.cc +++ b/components/translate/content/browser/content_translate_driver.cc @@ -206,6 +206,7 @@ void ContentTranslateDriver::NavigationEntryCommitted( } void ContentTranslateDriver::DidNavigateAnyFrame( + content::RenderFrameHost* render_frame_host, const content::LoadCommittedDetails& details, const content::FrameNavigateParams& params) { // Let the LanguageState clear its state. diff --git a/components/translate/content/browser/content_translate_driver.h b/components/translate/content/browser/content_translate_driver.h index 3bed413..196ebaf 100644 --- a/components/translate/content/browser/content_translate_driver.h +++ b/components/translate/content/browser/content_translate_driver.h @@ -91,6 +91,7 @@ class ContentTranslateDriver : public TranslateDriver, virtual void NavigationEntryCommitted( const content::LoadCommittedDetails& load_details) override; virtual void DidNavigateAnyFrame( + content::RenderFrameHost* render_frame_host, const content::LoadCommittedDetails& details, const content::FrameNavigateParams& params) override; virtual bool OnMessageReceived(const IPC::Message& message) override; diff --git a/content/browser/android/web_contents_observer_android.cc b/content/browser/android/web_contents_observer_android.cc index 237abd6..4e0bc4a 100644 --- a/content/browser/android/web_contents_observer_android.cc +++ b/content/browser/android/web_contents_observer_android.cc @@ -154,6 +154,7 @@ void WebContentsObserverAndroid::DidNavigateMainFrame( } void WebContentsObserverAndroid::DidNavigateAnyFrame( + RenderFrameHost* render_frame_host, const LoadCommittedDetails& details, const FrameNavigateParams& params) { JNIEnv* env = AttachCurrentThread(); diff --git a/content/browser/android/web_contents_observer_android.h b/content/browser/android/web_contents_observer_android.h index 21b415c..4292903 100644 --- a/content/browser/android/web_contents_observer_android.h +++ b/content/browser/android/web_contents_observer_android.h @@ -47,7 +47,8 @@ class WebContentsObserverAndroid : public WebContentsObserver { const base::string16& error_description) override; virtual void DidNavigateMainFrame(const LoadCommittedDetails& details, const FrameNavigateParams& params) override; - virtual void DidNavigateAnyFrame(const LoadCommittedDetails& details, + virtual void DidNavigateAnyFrame(RenderFrameHost* render_frame_host, + const LoadCommittedDetails& details, const FrameNavigateParams& params) override; virtual void DidFirstVisuallyNonEmptyPaint() override; virtual void DidStartProvisionalLoadForFrame( diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index d2161d5..4dd91a2 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -2647,7 +2647,7 @@ void WebContentsImpl::DidNavigateAnyFramePostCommit( // Notify observers about navigation. FOR_EACH_OBSERVER(WebContentsObserver, observers_, - DidNavigateAnyFrame(details, params)); + DidNavigateAnyFrame(render_frame_host, details, params)); } void WebContentsImpl::SetMainFrameMimeType(const std::string& mime_type) { diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h index ea9b81e..c9a0e8b 100644 --- a/content/public/browser/web_contents_observer.h +++ b/content/public/browser/web_contents_observer.h @@ -156,6 +156,7 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener, // And regardless of what frame navigated, this method is invoked after // DidCommitProvisionalLoadForFrame was invoked. virtual void DidNavigateAnyFrame( + RenderFrameHost* render_frame_host, const LoadCommittedDetails& details, const FrameNavigateParams& params) {} diff --git a/content/test/test_frame_navigation_observer.cc b/content/test/test_frame_navigation_observer.cc index b9404ba..c6d151b 100644 --- a/content/test/test_frame_navigation_observer.cc +++ b/content/test/test_frame_navigation_observer.cc @@ -59,6 +59,7 @@ void TestFrameNavigationObserver::DidStartProvisionalLoadForFrame( } void TestFrameNavigationObserver::DidNavigateAnyFrame( + RenderFrameHost* render_frame_host, const LoadCommittedDetails& details, const FrameNavigateParams& params) { if (!navigation_started_) diff --git a/content/test/test_frame_navigation_observer.h b/content/test/test_frame_navigation_observer.h index 5d37e69..7cbf57e 100644 --- a/content/test/test_frame_navigation_observer.h +++ b/content/test/test_frame_navigation_observer.h @@ -46,6 +46,7 @@ class TestFrameNavigationObserver : public WebContentsObserver { bool is_error_page, bool is_iframe_srcdoc) override; virtual void DidNavigateAnyFrame( + RenderFrameHost* render_frame_host, const LoadCommittedDetails& details, const FrameNavigateParams& params) override; |