Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Unified Diff: webkit/tools/test_shell/test_webview_delegate.cc

Issue 1036003: Add chromium-side support for history.{push,replace}State. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/tools/test_shell/test_webview_delegate.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_webview_delegate.cc
===================================================================
--- webkit/tools/test_shell/test_webview_delegate.cc (revision 41846)
+++ webkit/tools/test_shell/test_webview_delegate.cc (working copy)
@@ -877,16 +877,18 @@
LocationChangeDone(frame);
}
-void TestWebViewDelegate::didChangeLocationWithinPage(
+void TestWebViewDelegate::didNavigateWithinPage(
WebFrame* frame, bool is_new_navigation) {
frame->dataSource()->setExtraData(pending_extra_data_.release());
+ UpdateForCommittedLoad(frame, is_new_navigation);
+}
+
+void TestWebViewDelegate::didChangeLocationWithinPage(WebFrame* frame) {
if (shell_->ShouldDumpFrameLoadCallbacks()) {
printf("%S - didChangeLocationWithinPageForFrame\n",
GetFrameDescription(frame).c_str());
}
-
- UpdateForCommittedLoad(frame, is_new_navigation);
}
void TestWebViewDelegate::assignIdentifierToRequest(
@@ -1087,8 +1089,7 @@
if (!data_source)
return;
- // TODO(abarth): This is wrong!
- SetAddressBarURL(data_source->request().firstPartyForCookies());
+ SetAddressBarURL(data_source->request().url());
}
void TestWebViewDelegate::LocationChangeDone(WebFrame* frame) {
@@ -1156,6 +1157,7 @@
shell_->navigation_controller()->DidNavigateToEntry(entry.release());
shell_->UpdateNavigationControls();
+ UpdateAddressBar(frame->view());
last_page_id_updated_ = std::max(last_page_id_updated_, page_id_);
}
« no previous file with comments | « webkit/tools/test_shell/test_webview_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698