summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/test_webview_delegate.h
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-17 17:58:43 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-17 17:58:43 +0000
commitccbe04e3b032c3a3acbf6a2221ee1f90b39c4598 (patch)
treeb8be8967400bf09d66e47738a950483f1bfd563a /webkit/tools/test_shell/test_webview_delegate.h
parent0bda44defc2da589b24c6936d8ac55b979eb8901 (diff)
downloadchromium_src-ccbe04e3b032c3a3acbf6a2221ee1f90b39c4598.zip
chromium_src-ccbe04e3b032c3a3acbf6a2221ee1f90b39c4598.tar.gz
chromium_src-ccbe04e3b032c3a3acbf6a2221ee1f90b39c4598.tar.bz2
Add chromium-side support for history.{push,replace}State.
Enables the feature so that all but 2 of the related layout tests pass. Modifies TestShell to correctly update its location bar as navigations occur. It was incorrectly showing firstPartyForCookies for some crazy reason. Modifies glue_serialize.cc to store the state object associated with a session history entry. Modifies navigation_controller.cc to always replace the current navigation entry when observing an in-page navigation. This is required since the page ID isn't changing for an in-page navigation. BUG=29393 R=brettw TEST=covered by layout tests Review URL: http://codereview.chromium.org/1036003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41850 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_webview_delegate.h')
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index 8b12590..f6b4ace 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -190,8 +190,10 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
virtual void didFailLoad(
WebKit::WebFrame*, const WebKit::WebURLError&);
virtual void didFinishLoad(WebKit::WebFrame*);
+ virtual void didNavigateWithinPage(
+ WebKit::WebFrame*, bool is_new_navigation);
virtual void didChangeLocationWithinPage(
- WebKit::WebFrame*, bool isNewNavigation);
+ WebKit::WebFrame*);
virtual void assignIdentifierToRequest(
WebKit::WebFrame*, unsigned identifier, const WebKit::WebURLRequest&);
virtual void willSendRequest(