Classify navigations without page id in parallel to the existing classifier.

content/public/renderer/navigation_state.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_PUBLIC_RENDERER_NAVIGATION_STATE_H_
 #define CONTENT_PUBLIC_RENDERER_NAVIGATION_STATE_H_
 
 #include <string>
 
 #include "content/common/content_export.h"
 #include "ui/base/page_transition_types.h"
 
 namespace content {
 
 // NavigationState is the portion of DocumentState that is affected by
 // in-document navigation.
 // TODO(simonjam): Move this to HistoryItem's ExtraData.
 class CONTENT_EXPORT NavigationState {
  public:
   virtual ~NavigationState();
 
   static NavigationState* CreateBrowserInitiated(
       int32 pending_page_id,
+      int pending_nav_entry_id,
       int pending_history_list_offset,
       bool history_list_was_cleared,
       ui::PageTransition transition_type) {
     return new NavigationState(transition_type,
                                false,
                                pending_page_id,
+                               pending_nav_entry_id,
                                pending_history_list_offset,
                                history_list_was_cleared);
   }
 
   static NavigationState* CreateContentInitiated() {
     return new NavigationState(
-        ui::PAGE_TRANSITION_LINK, true, -1, -1, false);
+        ui::PAGE_TRANSITION_LINK, true, -1, 0, -1, false);
   }
 
   // Contains the page_id for this navigation or -1 if there is none yet.
   int32 pending_page_id() const { return pending_page_id_; }
 
+  // Contains the nav_entry_id for this navigation if it is browser-initiated,
+  // or 0 if there is none because it was renderer-initiated.
+  int32 pending_nav_entry_id() const {
+    return pending_nav_entry_id_;
+  }
+
   // If pending_page_id() is not -1, then this contains the corresponding
   // offset of the page in the back/forward history list.
   int pending_history_list_offset() const {
     return pending_history_list_offset_;
   }
 
   // If pending_page_id() is not -1, then this returns true if the session
   // history was cleared during this navigation.
   bool history_list_was_cleared() const {
     return history_list_was_cleared_;
@@ skipping 60 matching lines @@
 
   void set_extra_headers(const std::string& extra_headers) {
     extra_headers_ = extra_headers;
   }
   const std::string& extra_headers() { return extra_headers_; }
 
  private:
   NavigationState(ui::PageTransition transition_type,
                   bool is_content_initiated,
                   int32 pending_page_id,
+                  int pending_nav_entry_id,
                   int pending_history_list_offset,
                   bool history_list_was_cleared);
 
   ui::PageTransition transition_type_;
   bool request_committed_;
   bool is_content_initiated_;
   int32 pending_page_id_;
+  int pending_nav_entry_id_;
   int pending_history_list_offset_;
   bool history_list_was_cleared_;
   bool should_replace_current_entry_;
 
   bool was_within_same_page_;
   int transferred_request_child_id_;
   int transferred_request_request_id_;
   bool allow_download_;
   std::string extra_headers_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationState);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_RENDERER_NAVIGATION_STATE_H_