Send session history offset and length parameters in the Navigate message to...

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/tab_contents/tab_contents.h"
 
 #include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/auto_reset.h"
@@ skipping 186 matching lines @@
       break;  // Fall through to rest of function.
   }
 
   if (entry.restore_type() == NavigationEntry::RESTORE_LAST_SESSION &&
       profile->DidLastSessionExitCleanly())
     return ViewMsg_Navigate_Params::RESTORE;
 
   return ViewMsg_Navigate_Params::NORMAL;
 }
 
-void MakeNavigateParams(Profile* profile, const NavigationEntry& entry,
+void MakeNavigateParams(const NavigationController& controller,
                         NavigationController::ReloadType reload_type,
                         ViewMsg_Navigate_Params* params) {
+  const NavigationEntry& entry = *controller.pending_entry();
   params->page_id = entry.page_id();
+  params->pending_history_list_offset = controller.pending_entry_index();
+  params->current_history_list_offset = controller.last_committed_entry_index();
+  params->current_history_list_length = controller.entry_count();
   params->url = entry.url();
   params->referrer = entry.referrer();
   params->transition = entry.transition_type();
   params->state = entry.content_state();
-  params->navigation_type = GetNavigationType(profile, entry, reload_type);
+  params->navigation_type =
+      GetNavigationType(controller.profile(), entry, reload_type);
   params->request_time = base::Time::Now();
 }
 
 }  // namespace
 
 // -----------------------------------------------------------------------------
 
 // static
 int TabContents::find_request_id_counter_ = -1;
 
@@ skipping 493 matching lines @@
     NavigationController::ReloadType reload_type) {
   const NavigationEntry& entry = *controller_.pending_entry();
 
   RenderViewHost* dest_render_view_host = render_manager_.Navigate(entry);
   if (!dest_render_view_host)
     return false;  // Unable to create the desired render view host.
 
   // Tell DevTools agent that it is attached prior to the navigation.
   DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
   if (devtools_manager) {  // NULL in unit tests.
-    devtools_manager->OnNavigatingToPendingEntry(
-        render_view_host(),
-        dest_render_view_host,
-        controller_.pending_entry()->url());
+    devtools_manager->OnNavigatingToPendingEntry(render_view_host(),
+                                                 dest_render_view_host,
+                                                 entry.url());
   }
 
   // Used for page load time metrics.
   current_load_start_ = base::TimeTicks::Now();
 
   // Navigate in the desired RenderViewHost.
   ViewMsg_Navigate_Params navigate_params;
-  MakeNavigateParams(profile(), entry, reload_type, &navigate_params);
+  MakeNavigateParams(controller_, reload_type, &navigate_params);
   dest_render_view_host->Navigate(navigate_params);
 
   if (entry.page_id() == -1) {
     // HACK!!  This code suppresses javascript: URLs from being added to
     // session history, which is what we want to do for javascript: URLs that
     // do not generate content.  What we really need is a message from the
     // renderer telling us that a new page was not created.  The same message
     // could be used for mailto: URLs and the like.
     if (entry.url().SchemeIs(chrome::kJavaScriptScheme))
       return false;
@@ skipping 1036 matching lines @@
       NotificationType::FIND_RESULT_AVAILABLE,
       Source<TabContents>(this),
       Details<FindNotificationDetails>(&last_search_result_));
 }
 
 void TabContents::GoToEntryAtOffset(int offset) {
   if (!delegate_ || delegate_->OnGoToEntryOffset(offset))
     controller_.GoToOffset(offset);
 }
 
-void TabContents::GetHistoryListCount(int* back_list_count,
-                                      int* forward_list_count) {
-  int current_index = controller_.last_committed_entry_index();
-  *back_list_count = current_index;
-  *forward_list_count = controller_.entry_count() - current_index - 1;
-}
-
 void TabContents::OnMissingPluginStatus(int status) {
 #if defined(OS_WIN)
 // TODO(PORT): pull in when plug-ins work
   GetPluginInstaller()->OnMissingPluginStatus(status);
 #endif
 }
 
 void TabContents::OnCrashedPlugin(const FilePath& plugin_path) {
   DCHECK(!plugin_path.value().empty());
 
@@ skipping 1058 matching lines @@
 }
 
 void TabContents::set_encoding(const std::string& encoding) {
   encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding);
 }
 
 void TabContents::SetAppIcon(const SkBitmap& app_icon) {
   app_icon_ = app_icon;
   NotifyNavigationStateChanged(INVALIDATE_TITLE);
 }