summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-25 17:35:45 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-25 17:35:45 +0000
commit28b92dfdb7135578d458ed6c85cd667a4b1cb8f2 (patch)
tree771f49ff652f0d1cc091d3c1e34520f2fc1a7137 /webkit/glue
parentd99a435cc59e094784cabcab678112c104ebe0b1 (diff)
downloadchromium_src-28b92dfdb7135578d458ed6c85cd667a4b1cb8f2.zip
chromium_src-28b92dfdb7135578d458ed6c85cd667a4b1cb8f2.tar.gz
chromium_src-28b92dfdb7135578d458ed6c85cd667a4b1cb8f2.tar.bz2
Move another method from WebViewDelegate to WebViewClient.
This is kinda like yelling, right? R=dglazkov BUG=10033 TEST=none Review URL: http://codereview.chromium.org/241002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27210 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/dragclient_impl.cc2
-rw-r--r--webkit/glue/webview_delegate.h6
2 files changed, 1 insertions, 7 deletions
diff --git a/webkit/glue/dragclient_impl.cc b/webkit/glue/dragclient_impl.cc
index dff2ccd..cb29825 100644
--- a/webkit/glue/dragclient_impl.cc
+++ b/webkit/glue/dragclient_impl.cc
@@ -33,7 +33,7 @@ void DragClientImpl::willPerformDragSourceAction(
WebCore::DragDestinationAction DragClientImpl::actionMaskForDrag(
WebCore::DragData*) {
- if (webview_->delegate()->CanAcceptLoadDrops()) {
+ if (webview_->client() && webview_->client()->acceptsLoadDrops()) {
return WebCore::DragDestinationActionAny;
} else {
return static_cast<WebCore::DragDestinationAction>
diff --git a/webkit/glue/webview_delegate.h b/webkit/glue/webview_delegate.h
index 3d1964c..0773109 100644
--- a/webkit/glue/webview_delegate.h
+++ b/webkit/glue/webview_delegate.h
@@ -102,12 +102,6 @@ class WebViewDelegate : public WebKit::WebViewClient {
// FrameLoaderClient -------------------------------------------------------
- virtual bool CanAcceptLoadDrops() const {
- // Always return true here so layout tests (which use the default WebView
- // delegate) continue to pass.
- return true;
- }
-
// Notifies that a new script context has been created for this frame.
// This is similar to WindowObjectCleared but only called once per frame
// context.