Finish unforking the async history item changes.

BUG=3912
Review URL: http://codereview.chromium.org/9273

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4530 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 3 deletions

diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 5c0ab5a..7cebc16 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -1535,7 +1535,7 @@ WindowOpenDisposition RenderView::DispositionForNavigationAction(
         std::string offset_str = url.ExtractFileName();
         int offset;
         if (StringToInt(offset_str, &offset)) {
-          GoToEntryAtOffsetAsync(offset);
+          GoToEntryAtOffset(offset);
           return IGNORE_ACTION;  // The browser process handles this one.
         }
       }
@@ -2296,7 +2296,7 @@ WebHistoryItem* RenderView::GetHistoryEntryAtOffset(int offset) {
   return history_navigation_item_.get();
 }
 
-void RenderView::GoToEntryAtOffsetAsync(int offset) {
+void RenderView::GoToEntryAtOffset(int offset) {
   history_back_list_count_ += offset;
   history_forward_list_count_ -= offset;
 
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index caed67d..eee08e1 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -234,7 +234,6 @@ class RenderView : public RenderWidget, public WebViewDelegate,
   virtual void JSOutOfMemory();
 
   virtual WebHistoryItem* GetHistoryEntryAtOffset(int offset);
-  virtual void GoToEntryAtOffsetAsync(int offset);
   virtual int GetHistoryBackListCount();
   virtual int GetHistoryForwardListCount();
   virtual void OnNavStateChanged(WebView* webview);
@@ -364,6 +363,10 @@ class RenderView : public RenderWidget, public WebViewDelegate,
   // keyword search.
   void AddGURLSearchProvider(const GURL& osd_url, bool autodetected);
 
+  // Tells the browser process to navigate to a back/forward entry at the given
+  // offset from current.
+  void GoToEntryAtOffset(int offset);
+
   // RenderView IPC message handlers
   void OnCreatingNewAck(HWND parent);
   void SendThumbnail();