| Index: chrome/browser/extensions/api/web_navigation/web_navigation_api.h
|
| diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h
|
| index 671a0aa053c36a51522b9020e8a503a08c22fc9d..c0cfe0500a8dd6621e5d47b43d2c4545748a2911 100644
|
| --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h
|
| +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h
|
| @@ -50,20 +50,10 @@ class WebNavigationTabObserver
|
| void FrameDeleted(content::RenderFrameHost* render_frame_host) override;
|
| void RenderFrameHostChanged(content::RenderFrameHost* old_host,
|
| content::RenderFrameHost* new_host) override;
|
| - void DidStartProvisionalLoadForFrame(
|
| - content::RenderFrameHost* render_frame_host,
|
| - const GURL& validated_url,
|
| - bool is_error_page,
|
| - bool is_iframe_srcdoc) override;
|
| - void DidCommitProvisionalLoadForFrame(
|
| - content::RenderFrameHost* render_frame_host,
|
| - const GURL& url,
|
| - ui::PageTransition transition_type) override;
|
| - void DidFailProvisionalLoad(content::RenderFrameHost* render_frame_host,
|
| - const GURL& validated_url,
|
| - int error_code,
|
| - const base::string16& error_description,
|
| - bool was_ignored_by_handler) override;
|
| + void DidStartNavigation(
|
| + content::NavigationHandle* navigation_handle) override;
|
| + void DidFinishNavigation(
|
| + content::NavigationHandle* navigation_handle) override;
|
| void DocumentLoadedInFrame(
|
| content::RenderFrameHost* render_frame_host) override;
|
| void DidFinishLoad(content::RenderFrameHost* render_frame_host,
|
| @@ -73,9 +63,6 @@ class WebNavigationTabObserver
|
| int error_code,
|
| const base::string16& error_description,
|
| bool was_ignored_by_handler) override;
|
| - void DidGetRedirectForResourceRequest(
|
| - content::RenderFrameHost* render_frame_host,
|
| - const content::ResourceRedirectDetails& details) override;
|
| void DidOpenRequestedURL(content::WebContents* new_contents,
|
| content::RenderFrameHost* source_render_frame_host,
|
| const GURL& url,
|
| @@ -88,6 +75,9 @@ class WebNavigationTabObserver
|
| explicit WebNavigationTabObserver(content::WebContents* web_contents);
|
| friend class content::WebContentsUserData<WebNavigationTabObserver>;
|
|
|
| + void HandleCommit(content::NavigationHandle* navigation_handle);
|
| + void HandleError(content::NavigationHandle* navigation_handle);
|
| +
|
| // True if the transition and target url correspond to a reference fragment
|
| // navigation.
|
| bool IsReferenceFragmentNavigation(content::RenderFrameHost* frame_host,
|
|
|