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

7 files changed, 0 insertions, 22 deletions

diff --git a/webkit/glue/webview_delegate.h b/webkit/glue/webview_delegate.h
index c8aa405..b9f2b9e 100644
--- a/webkit/glue/webview_delegate.h
+++ b/webkit/glue/webview_delegate.h
@@ -661,10 +661,6 @@ class WebViewDelegate : virtual public WebWidgetDelegate {
     return NULL;
   }
 
-  // Asynchronously navigates to the history entry at the given offset.
-  virtual void GoToEntryAtOffsetAsync(int offset) {
-  }
-
   // Returns how many entries are in the back and forward lists, respectively.
   virtual int GetHistoryBackListCount() {
     return 0;
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index 9816773..814d168 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -1459,11 +1459,6 @@ WebCore::HistoryItem* WebViewImpl::itemAtIndex(int index) {
   return pending_history_item_->GetHistoryItem();
 }
 
-void WebViewImpl::goToItemAtIndexAsync(int index) {
-  if (delegate_)
-    delegate_->GoToEntryAtOffsetAsync(index);
-}
-
 int WebViewImpl::backListCount() {
   if (!delegate_)
     return 0;
diff --git a/webkit/glue/webview_impl.h b/webkit/glue/webview_impl.h
index 96efd28..9bc6c4b 100644
--- a/webkit/glue/webview_impl.h
+++ b/webkit/glue/webview_impl.h
@@ -201,7 +201,6 @@ class WebViewImpl : public WebView, public WebCore::BackForwardListClient {
   virtual void didAddHistoryItem(WebCore::HistoryItem* item);
   virtual void willGoToHistoryItem(WebCore::HistoryItem* item);
   virtual WebCore::HistoryItem* itemAtIndex(int index);
-  virtual void goToItemAtIndexAsync(int index);
   virtual int backListCount();
   virtual int forwardListCount();
 
diff --git a/webkit/port/history/BackForwardList.cpp b/webkit/port/history/BackForwardList.cpp
index c55d0e2..0f64861 100644
--- a/webkit/port/history/BackForwardList.cpp
+++ b/webkit/port/history/BackForwardList.cpp
@@ -160,11 +160,6 @@ HistoryItem* BackForwardList::itemAtIndex(int index)
     return m_client->itemAtIndex(index);
 }
 
-void BackForwardList::goToItemAtIndexAsync(int index)
-{
-    m_client->goToItemAtIndexAsync(index);
-}
-
 void BackForwardList::close()
 {
     m_closed = true;
diff --git a/webkit/port/history/BackForwardList.h b/webkit/port/history/BackForwardList.h
index e796913..ae93013 100644
--- a/webkit/port/history/BackForwardList.h
+++ b/webkit/port/history/BackForwardList.h
@@ -62,7 +62,6 @@ public:
     virtual void didAddHistoryItem(HistoryItem* item) = 0;
     virtual void willGoToHistoryItem(HistoryItem* item) = 0;
     virtual HistoryItem* itemAtIndex(int index) = 0;
-    virtual void goToItemAtIndexAsync(int index) = 0;
     virtual int backListCount() = 0;
     virtual int forwardListCount() = 0;
 };
@@ -88,7 +87,6 @@ public:
     HistoryItem* forwardItem();
     HistoryItem* previousItem();
     HistoryItem* itemAtIndex(int);
-    void goToItemAtIndexAsync(int);
 
     // Returns an iterable container of all history items, which will be
     // traversed in order to clear the page cache when it's disabled (see
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index bde633b..7e21c6f 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -633,10 +633,6 @@ WebHistoryItem* TestWebViewDelegate::GetHistoryEntryAtOffset(int offset) {
   return entry->GetHistoryItem();
 }
 
-void TestWebViewDelegate::GoToEntryAtOffsetAsync(int offset) {
-  shell_->navigation_controller()->GoToOffset(offset);
-}
-
 int TestWebViewDelegate::GetHistoryBackListCount() {
   int current_index =
       shell_->navigation_controller()->GetLastCommittedEntryIndex();
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index e1a9e74..36bfac0 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -188,7 +188,6 @@ class TestWebViewDelegate : public base::RefCounted<TestWebViewDelegate>,
     bool is_redirect);
   void SetCustomPolicyDelegate(bool isCustom);
   virtual WebHistoryItem* GetHistoryEntryAtOffset(int offset);
-  virtual void GoToEntryAtOffsetAsync(int offset);
   virtual int GetHistoryBackListCount();
   virtual int GetHistoryForwardListCount();