summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/navigation_state.h
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-18 21:09:28 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-18 21:09:28 +0000
commit726985e24233bdfd13d2fcee05100ce19fb85525 (patch)
tree7e16dc159f929577c80f0cf993b5ec51ffc3217d /chrome/renderer/navigation_state.h
parenta3f0c997f88517619709282f70fbf5e27942cdae (diff)
downloadchromium_src-726985e24233bdfd13d2fcee05100ce19fb85525.zip
chromium_src-726985e24233bdfd13d2fcee05100ce19fb85525.tar.gz
chromium_src-726985e24233bdfd13d2fcee05100ce19fb85525.tar.bz2
Delete files from webkit/glue that have been made obsolete by corresponding
files in webkit/api. Here's the mapping: webkit/glue/webdatasource.h -> webkit/api/public/WebDataSource.h webkit/glue/weberror.h -> webkit/api/public/WebURLError.h webkit/glue/weburlrequest.h -> webkit/api/public/WebURLRequest.h webkit/glue/webresponse.h -> webkit/api/public/WebURLResponse.h I kept the implementation of WebDataSource in webkit/glue for now because it helps to have it close to WebFrameImpl and WebFrameLoaderClient. To facilitate this change, I needed to make use of WrappedResourceRequest and WrappedResourceResponse from webkit/api/src within the implementation files of webkit/glue. This is only a temporary usage of webkit/api/src from the outside. It will go away when WebFrame, etc. get moved into webkit/api. I modified these wrapper classes to expose the 'bind' function so that I can re-bind a wrapper. This is used in WebDataSourceImpl::request() and related methods to allow the interface to return a const reference to a WebURLRequest and WebURLResponse. The changes here are fairly mechanical. I'm not too happy about the way WebDataSource::redirectChain now works. I would prefer a solution that didn't involve so much copying, but I'm not going to worry about optimizing that now. R=brettw BUG=10041 TEST=none Review URL: http://codereview.chromium.org/126286 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18747 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/navigation_state.h')
-rw-r--r--chrome/renderer/navigation_state.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/renderer/navigation_state.h b/chrome/renderer/navigation_state.h
index eabe25f6..7d6aed5 100644
--- a/chrome/renderer/navigation_state.h
+++ b/chrome/renderer/navigation_state.h
@@ -8,13 +8,13 @@
#include "base/scoped_ptr.h"
#include "base/time.h"
#include "chrome/common/page_transition_types.h"
+#include "webkit/api/public/WebDataSource.h"
#include "webkit/glue/password_form.h"
#include "webkit/glue/searchable_form_data.h"
-#include "webkit/glue/webdatasource.h"
// The RenderView stores an instance of this class in the "extra data" of each
// WebDataSource (see RenderView::DidCreateDataSource).
-class NavigationState : public WebDataSource::ExtraData {
+class NavigationState : public WebKit::WebDataSource::ExtraData {
public:
static NavigationState* CreateBrowserInitiated(
int32 pending_page_id,
@@ -29,8 +29,8 @@ class NavigationState : public WebDataSource::ExtraData {
return new NavigationState(PageTransition::LINK, base::Time(), true, -1);
}
- static NavigationState* FromDataSource(WebDataSource* ds) {
- return static_cast<NavigationState*>(ds->GetExtraData());
+ static NavigationState* FromDataSource(WebKit::WebDataSource* ds) {
+ return static_cast<NavigationState*>(ds->extraData());
}
// Contains the page_id for this navigation or -1 if there is none yet.