diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-05 06:11:00 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-05 06:11:00 +0000 |
| commit | 4d4a6356e8e1a6ac0b177cb6bd398148030cb320 (patch) | |
| tree | 9b6856e1e8523dc782c08ae917882250c5ed0503 /webkit/tools/test_shell/test_navigation_controller.cc | |
| parent | ca8de285102e2df854f56fce3c7163d5a8db7f5a (diff) | |
| download | chromium_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.cc')
| -rw-r--r-- | webkit/tools/test_shell/test_navigation_controller.cc | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/webkit/tools/test_shell/test_navigation_controller.cc b/webkit/tools/test_shell/test_navigation_controller.cc index ff4a753..cf26baf 100644 --- a/webkit/tools/test_shell/test_navigation_controller.cc +++ b/webkit/tools/test_shell/test_navigation_controller.cc @@ -5,7 +5,6 @@ #include "webkit/tools/test_shell/test_navigation_controller.h" #include "base/logging.h" -#include "webkit/glue/webhistoryitem.h" #include "webkit/tools/test_shell/test_shell.h" // ---------------------------------------------------------------------------- @@ -29,21 +28,9 @@ TestNavigationEntry::~TestNavigationEntry() { } void TestNavigationEntry::SetContentState(const std::string& state) { - cached_history_item_ = NULL; // invalidate our cached item state_ = state; } -WebHistoryItem* TestNavigationEntry::GetHistoryItem() const { - if (!cached_history_item_) { - TestShellExtraRequestData* extra_data = - new TestShellExtraRequestData(GetPageID()); - cached_history_item_ = - WebHistoryItem::Create(GetURL(), GetTitle(), GetContentState(), - extra_data); - } - return cached_history_item_; -} - // ---------------------------------------------------------------------------- // TestNavigationController |