| 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 e4a3c690075635f127d79aeee0c3ba83b90b64a5..f88eeb19c914f049ebecd89f3cc9f7f69b5917df 100644
|
| --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h
|
| +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h
|
| @@ -50,34 +50,34 @@ class WebNavigationTabObserver : public content::NotificationObserver,
|
| virtual void AboutToNavigateRenderView(
|
| content::RenderViewHost* render_view_host) OVERRIDE;
|
| virtual void DidStartProvisionalLoadForFrame(
|
| - int64 frame_id,
|
| + int64 frame_num,
|
| bool is_main_frame,
|
| const GURL& validated_url,
|
| bool is_error_page,
|
| content::RenderViewHost* render_view_host) OVERRIDE;
|
| virtual void DidCommitProvisionalLoadForFrame(
|
| - int64 frame_id,
|
| + int64 frame_num,
|
| bool is_main_frame,
|
| const GURL& url,
|
| content::PageTransition transition_type,
|
| content::RenderViewHost* render_view_host) OVERRIDE;
|
| virtual void DidFailProvisionalLoad(
|
| - int64 frame_id,
|
| + int64 frame_num,
|
| bool is_main_frame,
|
| const GURL& validated_url,
|
| int error_code,
|
| const string16& error_description,
|
| content::RenderViewHost* render_view_host) OVERRIDE;
|
| virtual void DocumentLoadedInFrame(
|
| - int64 frame_id,
|
| + int64 frame_num,
|
| content::RenderViewHost* render_view_host) OVERRIDE;
|
| virtual void DidFinishLoad(
|
| - int64 frame_id,
|
| + int64 frame_num,
|
| const GURL& validated_url,
|
| bool is_main_frame,
|
| content::RenderViewHost* render_view_host) OVERRIDE;
|
| virtual void DidFailLoad(
|
| - int64 frame_id,
|
| + int64 frame_num,
|
| const GURL& validated_url,
|
| bool is_main_frame,
|
| int error_code,
|
| @@ -88,13 +88,14 @@ class WebNavigationTabObserver : public content::NotificationObserver,
|
| const content::Referrer& referrer,
|
| WindowOpenDisposition disposition,
|
| content::PageTransition transition,
|
| - int64 source_frame_id) OVERRIDE;
|
| + int64 source_frame_num) OVERRIDE;
|
| virtual void WebContentsDestroyed(content::WebContents* tab) OVERRIDE;
|
|
|
| private:
|
| // True if the transition and target url correspond to a reference fragment
|
| // navigation.
|
| - bool IsReferenceFragmentNavigation(int64 frame_id, const GURL& url);
|
| + bool IsReferenceFragmentNavigation(FrameNavigationState::FrameID frame_id,
|
| + const GURL& url);
|
|
|
| // Tracks the state of the frames we are sending events for.
|
| FrameNavigationState navigation_state_;
|
|
|