diff options
| -rw-r--r-- | webkit/glue/webframeloaderclient_impl.cc | 6 | ||||
| -rw-r--r-- | webkit/glue/webview_delegate.h | 4 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 8 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.h | 1 |
4 files changed, 2 insertions, 17 deletions
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc index d864839..355e301 100644 --- a/webkit/glue/webframeloaderclient_impl.cc +++ b/webkit/glue/webframeloaderclient_impl.cc @@ -560,10 +560,8 @@ void WebFrameLoaderClient::dispatchWillClose() { } void WebFrameLoaderClient::dispatchDidReceiveIcon() { - WebViewImpl* webview = webframe_->GetWebViewImpl(); - WebViewDelegate* d = webview->delegate(); - if (d) - d->DidReceiveIconForFrame(webview, webframe_); + // The icon database is disabled, so this should never be called. + ASSERT_NOT_REACHED(); } void WebFrameLoaderClient::dispatchDidStartProvisionalLoad() { diff --git a/webkit/glue/webview_delegate.h b/webkit/glue/webview_delegate.h index dd44e4b..a32b479 100644 --- a/webkit/glue/webview_delegate.h +++ b/webkit/glue/webview_delegate.h @@ -161,10 +161,6 @@ class WebViewDelegate : virtual public WebKit::WebWidgetClient { virtual void DidCreateIsolatedScriptContext(WebKit::WebFrame* webframe) { } - // This is called when the favicon for a frame has been received. - virtual void DidReceiveIconForFrame(WebView* webview, WebKit::WebFrame* frame) { - } - // ChromeClient ------------------------------------------------------------ // Appends a line to the application's error console. The message contains diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 4116df0..131e7cd 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -260,14 +260,6 @@ std::string TestWebViewDelegate::GetResourceDescription(uint32 identifier) { return it != resource_identifier_map_.end() ? it->second : "<unknown>"; } -void TestWebViewDelegate::DidReceiveIconForFrame(WebView* webview, - WebFrame* frame) { - if (shell_->ShouldDumpFrameLoadCallbacks()) { - printf("%S - didReceiveIconForFrame\n", - GetFrameDescription(frame).c_str()); - } -} - void TestWebViewDelegate::AddMessageToConsole(WebView* webview, const std::wstring& message, unsigned int line_no, diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h index 4aed05e..46ff7b6 100644 --- a/webkit/tools/test_shell/test_webview_delegate.h +++ b/webkit/tools/test_shell/test_webview_delegate.h @@ -113,7 +113,6 @@ class TestWebViewDelegate : public WebViewDelegate, int edit_flags, const std::string& security_info, const std::string& frame_charset); - virtual void DidReceiveIconForFrame(WebView* webview, WebKit::WebFrame* frame); virtual void NavigateBackForwardSoon(int offset); virtual int GetHistoryBackListCount(); virtual int GetHistoryForwardListCount(); |