summaryrefslogtreecommitdiffstats
path: root/content/browser/frame_host/navigation_controller_impl.h
diff options
context:
space:
mode:
authoravi <avi@chromium.org>2015-05-08 10:52:38 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-08 17:53:09 +0000
commit7c6f35e1d8731ff5c51ee3910ba24a14e7a8d87c (patch)
tree6bbccc46c9fe95678350fa70ce3d4f8d8bbcc3c3 /content/browser/frame_host/navigation_controller_impl.h
parent575f7fb5bbd8a5e20431f5dabb4cffd2f8bcf545 (diff)
downloadchromium_src-7c6f35e1d8731ff5c51ee3910ba24a14e7a8d87c.zip
chromium_src-7c6f35e1d8731ff5c51ee3910ba24a14e7a8d87c.tar.gz
chromium_src-7c6f35e1d8731ff5c51ee3910ba24a14e7a8d87c.tar.bz2
Classify navigations without page id in parallel to the existing classifier.
For now, this only happens in debug builds. BUG=369661 TEST=NavigationControllerBrowserTest.NavigationTypeClassification_* TEST=Every other test on the planet. Committed: https://crrev.com/d8d93348bbd8c646c337bdaa40fc0c64204fc5ff Cr-Commit-Position: refs/heads/master@{#327122} Reverted: https://crrev.com/5348e920f4119aff9a4eb76c0965725dc85a66cc Cr-Revert-Position: refs/heads/master@{#327152} Committed: https://crrev.com/5671403d44971669e4d81aecf3f002188ce0e95f Cr-Commit-Position: refs/heads/master@{#327214} Reverted: https://crrev.com/49180eb13549e440bbd4f66390e32e84699dcdfd Cr-Revert-Position: refs/heads/master@{#327269} Committed: https://crrev.com/a038c6670f450313a8e224ccc5d05dd59e3488c4 Cr-Commit-Position: refs/heads/master@{#328131} Reverted: https://crrev.com/1f5d6196b8d53e70e7a7a2276cdf3481365e7e04 Cr-Revert-Position: refs/heads/master@{#328282} Committed: https://crrev.com/61cae85448cfeb793270e804b5ad1023993279c5 Cr-Commit-Position: refs/heads/master@{#328829} Reverted: https://crrev.com/c0b9c8f3333acddb945165bce44f5605dcf56f0f Cr-Revert-Position: refs/heads/master@{#328924} Review URL: https://codereview.chromium.org/1002803002 Cr-Commit-Position: refs/heads/master@{#328979}
Diffstat (limited to 'content/browser/frame_host/navigation_controller_impl.h')
-rw-r--r--content/browser/frame_host/navigation_controller_impl.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/content/browser/frame_host/navigation_controller_impl.h b/content/browser/frame_host/navigation_controller_impl.h
index da3bbd3..85469401 100644
--- a/content/browser/frame_host/navigation_controller_impl.h
+++ b/content/browser/frame_host/navigation_controller_impl.h
@@ -107,6 +107,9 @@ class CONTENT_EXPORT NavigationControllerImpl
int GetEntryIndexWithPageID(SiteInstance* instance,
int32 page_id) const;
+ // Return the index of the entry with the given unique id, or -1 if not found.
+ int GetEntryIndexWithUniqueID(int nav_entry_id) const;
+
// Return the entry with the corresponding instance and page_id, or NULL if
// not found.
NavigationEntryImpl* GetEntryWithPageID(
@@ -231,6 +234,12 @@ class CONTENT_EXPORT NavigationControllerImpl
NavigationType ClassifyNavigation(
RenderFrameHostImpl* rfh,
const FrameHostMsg_DidCommitProvisionalLoad_Params& params) const;
+ // This does the same as above (hopefully), but does so without any use of
+ // deprecated page id values. Once it bakes and is verified to behave the
+ // same, it will replace it. http://crbug.com/369661
+ NavigationType ClassifyNavigationWithoutPageID(
+ RenderFrameHostImpl* rfh,
+ const FrameHostMsg_DidCommitProvisionalLoad_Params& params) const;
// Causes the controller to load the specified entry. The function assumes
// ownership of the pointer since it is put in the navigation list.