11 files changed, 3 insertions, 34 deletions
diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc
index f53709e..966a9e0 100644
--- a/chrome/renderer/print_web_view_helper.cc
+++ b/chrome/renderer/print_web_view_helper.cc
@@ -418,11 +418,6 @@ WebKit::WebScreenInfo PrintWebViewHelper::GetScreenInfo(WebWidget* webwidget) {
   return info;
 }
 
-gfx::NativeViewId PrintWebViewHelper::GetContainingView(WebWidget* webwidget) {
-  NOTREACHED();
-  return gfx::NativeViewId();
-}
-
 bool PrintWebViewHelper::IsHidden(WebWidget* webwidget) {
   NOTREACHED();
   return true;
diff --git a/chrome/renderer/print_web_view_helper.h b/chrome/renderer/print_web_view_helper.h
index dcfab9d..07a57c3 100644
--- a/chrome/renderer/print_web_view_helper.h
+++ b/chrome/renderer/print_web_view_helper.h
@@ -67,7 +67,6 @@ class PrintWebViewHelper : public WebViewDelegate {
 
   // WebViewDeletegate
   virtual void DidStopLoading(WebView* webview);
-  virtual gfx::NativeViewId GetContainingView(WebWidget* webwidget);
   virtual void DidInvalidateRect(WebWidget* webwidget,
                                  const WebKit::WebRect& rect) {}
   virtual void DidScrollRect(WebWidget* webwidget, int dx, int dy,
diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc
index daede7a..28ce0f3 100644
--- a/chrome/renderer/render_widget.cc
+++ b/chrome/renderer/render_widget.cc
@@ -483,10 +483,6 @@ void RenderWidget::DoDeferredScroll() {
 ///////////////////////////////////////////////////////////////////////////////
 // WebWidgetDelegate
 
-gfx::NativeViewId RenderWidget::GetContainingView(WebWidget* webwidget) {
-  return host_window_;
-}
-
 void RenderWidget::DidInvalidateRect(WebWidget* webwidget,
                                      const WebRect& rect) {
   // We only want one pending DoDeferredPaint call at any time...
diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h
index 0d5308b..4c5b17c 100644
--- a/chrome/renderer/render_widget.h
+++ b/chrome/renderer/render_widget.h
@@ -66,7 +66,6 @@ class RenderWidget : public IPC::Channel::Listener,
   virtual bool Send(IPC::Message* msg);
 
   // WebWidgetDelegate
-  virtual gfx::NativeViewId GetContainingView(WebWidget* webwidget);
   virtual void DidInvalidateRect(WebWidget* webwidget,
                                  const WebKit::WebRect& rect);
   virtual void DidScrollRect(WebWidget* webwidget, int dx, int dy,
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,
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index b97c923..d78971b 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -744,15 +744,6 @@ void TestWebViewDelegate::SetUserStyleSheetLocation(const GURL& location) {
 
 // WebWidgetDelegate ---------------------------------------------------------
 
-gfx::NativeViewId TestWebViewDelegate::GetContainingView(WebWidget* webwidget) {
-  // For test shell, we pack a NativeView pointer into the NativeViewId since
-  // everything is single process.
-  if (WebWidgetHost* host = GetHostForWidget(webwidget))
-    return gfx::IdFromNativeView(host->view_handle());
-
-  return NULL;
-}
-
 void TestWebViewDelegate::DidInvalidateRect(WebWidget* webwidget,
                                             const WebRect& rect) {
   if (WebWidgetHost* host = GetHostForWidget(webwidget))
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index 4c0f079..f463c22 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -222,7 +222,6 @@ class TestWebViewDelegate : public base::RefCounted<TestWebViewDelegate>,
   virtual int GetHistoryForwardListCount();
 
   // WebWidgetDelegate
-  virtual gfx::NativeViewId GetContainingView(WebWidget* webwidget);
   virtual void DidInvalidateRect(WebWidget* webwidget,
                                  const WebKit::WebRect& rect);
   virtual void DidScrollRect(WebWidget* webwidget, int dx, int dy,
diff --git a/webkit/tools/test_shell/test_webview_delegate_win.cc b/webkit/tools/test_shell/test_webview_delegate_win.cc
index c0dbc825..dc16544 100644
--- a/webkit/tools/test_shell/test_webview_delegate_win.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_win.cc
@@ -50,7 +50,7 @@ WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate(
     const std::string& mime_type,
     const std::string& clsid,
     std::string* actual_mime_type) {
-  HWND hwnd = gfx::NativeViewFromId(GetContainingView(webview));
+  HWND hwnd = shell_->webViewHost()->view_handle();
   if (!hwnd)
     return NULL;