diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-09 00:00:15 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-09 00:00:15 +0000 |
| commit | eb77db7a3e96920392f37023f7a916715ed893e6 (patch) | |
| tree | 29a3d6db8397cb4e804f28c8bfad8cea2f7028d4 /webkit/glue | |
| parent | f0d3bf17eb50f6e56adac08df7b051026229485c (diff) | |
| download | chromium_src-eb77db7a3e96920392f37023f7a916715ed893e6.zip chromium_src-eb77db7a3e96920392f37023f7a916715ed893e6.tar.gz chromium_src-eb77db7a3e96920392f37023f7a916715ed893e6.tar.bz2 | |
Remove WebWidgetDelegate::GetContainingView since it is not needed.
TEST=none
BUG=16234
R=jam
Review URL: http://codereview.chromium.org/155243
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20213 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/chrome_client_impl.cc | 3 | ||||
| -rw-r--r-- | webkit/glue/webwidget_delegate.h | 4 | ||||
| -rw-r--r-- | webkit/glue/webwidget_impl.cc | 4 | ||||
| -rw-r--r-- | webkit/glue/webworker_impl.cc | 3 |
4 files changed, 2 insertions, 12 deletions
diff --git a/webkit/glue/chrome_client_impl.cc b/webkit/glue/chrome_client_impl.cc index d843b0f..53aca2e 100644 --- a/webkit/glue/chrome_client_impl.cc +++ b/webkit/glue/chrome_client_impl.cc @@ -479,8 +479,7 @@ WebCore::IntRect ChromeClientImpl::windowToScreen( } PlatformWidget ChromeClientImpl::platformWindow() const { - WebViewDelegate* delegate = webview_->delegate(); - return delegate ? delegate->GetContainingView(webview_) : NULL; + return NULL; } void ChromeClientImpl::contentsSizeChanged(WebCore::Frame* frame, const diff --git a/webkit/glue/webwidget_delegate.h b/webkit/glue/webwidget_delegate.h index faca629..824b665 100644 --- a/webkit/glue/webwidget_delegate.h +++ b/webkit/glue/webwidget_delegate.h @@ -7,7 +7,6 @@ #include <vector> -#include "base/gfx/native_widget_types.h" #include "base/string16.h" #include "webkit/glue/window_open_disposition.h" @@ -38,9 +37,6 @@ struct WebMenuItem { class WebWidgetDelegate { public: - // Returns the view in which the WebWidget is embedded. - virtual gfx::NativeViewId GetContainingView(WebWidget* webwidget) = 0; - // Called when a region of the WebWidget needs to be re-painted. virtual void DidInvalidateRect(WebWidget* webwidget, const WebKit::WebRect& rect) = 0; diff --git a/webkit/glue/webwidget_impl.cc b/webkit/glue/webwidget_impl.cc index c738cdf..cb3a0c9 100644 --- a/webkit/glue/webwidget_impl.cc +++ b/webkit/glue/webwidget_impl.cc @@ -271,9 +271,7 @@ WebCore::IntRect WebWidgetImpl::windowToScreen( } PlatformWidget WebWidgetImpl::platformWindow() const { - if (!delegate_) - return NULL; - return delegate_->GetContainingView(const_cast<WebWidgetImpl*>(this)); + return NULL; } void WebWidgetImpl::scrollRectIntoView( diff --git a/webkit/glue/webworker_impl.cc b/webkit/glue/webworker_impl.cc index bfe27ac..d1ba068 100644 --- a/webkit/glue/webworker_impl.cc +++ b/webkit/glue/webworker_impl.cc @@ -56,9 +56,6 @@ class WorkerWebViewDelegate : public WebViewDelegate { virtual void DidScrollRect(WebWidget *webwidget, int dx, int dy, const WebKit::WebRect &clip_rect) { } virtual void Focus(WebWidget *webwidget) { } - virtual gfx::NativeViewId GetContainingView(WebWidget *webwidget) { - return gfx::NativeViewId(); - } virtual void GetRootWindowRect(WebWidget *webwidget, WebKit::WebRect *rect) { } virtual void GetRootWindowResizerRect(WebWidget *webwidget, |