summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/test_navigation_controller.h
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-05 06:11:00 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-05 06:11:00 +0000
commit4d4a6356e8e1a6ac0b177cb6bd398148030cb320 (patch)
tree9b6856e1e8523dc782c08ae917882250c5ed0503 /webkit/tools/test_shell/test_navigation_controller.h
parentca8de285102e2df854f56fce3c7163d5a8db7f5a (diff)
downloadchromium_src-4d4a6356e8e1a6ac0b177cb6bd398148030cb320.zip
chromium_src-4d4a6356e8e1a6ac0b177cb6bd398148030cb320.tar.gz
chromium_src-4d4a6356e8e1a6ac0b177cb6bd398148030cb320.tar.bz2
Re-do r15244: Fix crash in ~TestWebViewDelegate caused by
shell_ being null. Moved the RevokeDragDrop call to the TestShell destructor instead. 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/108004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15278 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_navigation_controller.h')
-rw-r--r--webkit/tools/test_shell/test_navigation_controller.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/test_navigation_controller.h b/webkit/tools/test_shell/test_navigation_controller.h
index 07f42f8..e24fff30 100644
--- a/webkit/tools/test_shell/test_navigation_controller.h
+++ b/webkit/tools/test_shell/test_navigation_controller.h
@@ -16,7 +16,6 @@
class GURL;
class TestShell;
-class WebHistoryItem;
// Associated with browser-initated navigations to hold tracking data.
class TestShellExtraRequestData : public WebRequest::ExtraData {
@@ -67,7 +66,6 @@ class TestNavigationEntry {
void SetPageID(int page_id) { page_id_ = page_id; }
int32 GetPageID() const { return page_id_; }
- WebHistoryItem* GetHistoryItem() const;
const std::wstring& GetTargetFrame() const { return target_frame_; }
private:
@@ -79,8 +77,6 @@ class TestNavigationEntry {
std::wstring title_;
std::string state_;
- mutable scoped_refptr<WebHistoryItem> cached_history_item_;
-
std::wstring target_frame_;
DISALLOW_COPY_AND_ASSIGN(TestNavigationEntry);