Eliminate webkit/glue/webhistoryitem* in favor of adding a

NavigateBackForwardSoon method WebViewDelegate.  This moves
all of the hacky details of how we intercept "history.{back,
forward,go}" into the webkit layer.  My eventual plan is to
teach WebCore how to make this not hacky.

BUG=11423
R=mpcomplete

Review URL: http://codereview.chromium.org/100353

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

1 files changed, 2 insertions, 13 deletions

diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 3b87d4f..46faf37 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -150,7 +150,6 @@ MSVC_POP_WARNING();
 #include "webkit/glue/webdatasource_impl.h"
 #include "webkit/glue/weberror_impl.h"
 #include "webkit/glue/webframe_impl.h"
-#include "webkit/glue/webhistoryitem_impl.h"
 #include "webkit/glue/weburlrequest_impl.h"
 #include "webkit/glue/webtextinput_impl.h"
 #include "webkit/glue/webview_impl.h"
@@ -714,25 +713,15 @@ void WebFrameImpl::CacheCurrentRequestInfo(WebDataSourceImpl* datasource) {
   // own requests, so the extra data needs to be transferred.
   scoped_refptr<WebRequest::ExtraData> extra;
 
-  // Our extra data may come from a request issued via LoadRequest, or a
-  // history navigation from WebCore.
-  if (currently_loading_request_) {
+  // Our extra data may come from a request issued via LoadRequest.
+  if (currently_loading_request_)
     extra = currently_loading_request_->GetExtraData();
-  } else if (currently_loading_history_item_) {
-    extra = currently_loading_history_item_->GetExtraData();
-    currently_loading_history_item_ = 0;
-  }
 
   // We must only update this if it is valid, or the valid state will be lost.
   if (extra)
     datasource->SetExtraData(extra);
 }
 
-void WebFrameImpl::set_currently_loading_history_item(
-    WebHistoryItemImpl* item) {
-  currently_loading_history_item_ = item;
-}
-
 void WebFrameImpl::StopLoading() {
   if (!frame_)
     return;