| Index: webkit/tools/test_shell/test_webview_delegate.cc
|
| ===================================================================
|
| --- webkit/tools/test_shell/test_webview_delegate.cc (revision 22283)
|
| +++ webkit/tools/test_shell/test_webview_delegate.cc (working copy)
|
| @@ -217,7 +217,7 @@
|
| }
|
|
|
| void TestWebViewDelegate::AssignIdentifierToRequest(
|
| - WebView* webview,
|
| + WebFrame* webframe,
|
| uint32 identifier,
|
| const WebURLRequest& request) {
|
| if (shell_->ShouldDumpResourceLoadCallbacks())
|
| @@ -229,7 +229,7 @@
|
| return it != resource_identifier_map_.end() ? it->second : "<unknown>";
|
| }
|
|
|
| -void TestWebViewDelegate::WillSendRequest(WebView* webview,
|
| +void TestWebViewDelegate::WillSendRequest(WebFrame* webframe,
|
| uint32 identifier,
|
| WebURLRequest* request) {
|
| GURL url = request->url();
|
| @@ -260,7 +260,7 @@
|
| request->setURL(GURL(TestShell::RewriteLocalUrl(request_url)));
|
| }
|
|
|
| -void TestWebViewDelegate::DidFinishLoading(WebView* webview,
|
| +void TestWebViewDelegate::DidFinishLoading(WebFrame* webframe,
|
| uint32 identifier) {
|
| TRACE_EVENT_END("url.load", identifier, "");
|
| if (shell_->ShouldDumpResourceLoadCallbacks()) {
|
| @@ -271,7 +271,7 @@
|
| resource_identifier_map_.erase(identifier);
|
| }
|
|
|
| -void TestWebViewDelegate::DidFailLoadingWithError(WebView* webview,
|
| +void TestWebViewDelegate::DidFailLoadingWithError(WebFrame* webframe,
|
| uint32 identifier,
|
| const WebURLError& error) {
|
| if (shell_->ShouldDumpResourceLoadCallbacks()) {
|
|
|