Change TestWebViewDelegate::createView in include WebWindowFeatures

This should have made it in with http://codereview.chromium.org/1758004/show (note change to RenderView) which is in anticipation of a webkit patch to actually change the ChromeClient to use the new signature.

Review URL: http://codereview.chromium.org/1695027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46024 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 16 insertions, 0 deletions

diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 408c0b0..2cffc29 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -41,6 +41,7 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebWindowFeatures.h"
 #include "webkit/appcache/web_application_cache_host_impl.h"
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/plugins/webplugin_impl.h"
@@ -106,6 +107,7 @@ using WebKit::WebURLError;
 using WebKit::WebURLRequest;
 using WebKit::WebURLResponse;
 using WebKit::WebWidget;
+using WebKit::WebWindowFeatures;
 using WebKit::WebWorker;
 using WebKit::WebWorkerClient;
 using WebKit::WebView;
@@ -309,7 +311,15 @@ void TestWebViewDelegate::SetAuthorAndUserStylesEnabled(bool is_enabled) {
 
 // WebViewClient -------------------------------------------------------------
 
+// TODO(rafaelw): remove when
+// WebViewClient::createView(WebFrame,WebWindowFeatures) lands.
 WebView* TestWebViewDelegate::createView(WebFrame* creator) {
+  return createView(creator, WebWindowFeatures());
+}
+
+WebView* TestWebViewDelegate::createView(
+    WebFrame* creator,
+    const WebWindowFeatures& window_features) {
   return shell_->CreateWebView();
 }
 
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index 34b3ee6..cdf0060 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -50,6 +50,7 @@ class WebWidgetHost;
 
 namespace WebKit {
 class WebStorageNamespace;
+struct WebWindowFeatures;
 }
 
 class TestWebViewDelegate : public WebKit::WebViewClient,
@@ -74,7 +75,12 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
   typedef std::vector<CapturedContextMenuEvent> CapturedContextMenuEvents;
 
   // WebKit::WebViewClient
+  // TODO(rafaelw): Remove this when
+  // WebViewClient::createView(WebFrame,WebWindowFeatures&) lands.
   virtual WebKit::WebView* createView(WebKit::WebFrame* creator);
+  virtual WebKit::WebView* createView(
+      WebKit::WebFrame* creator,
+      const WebKit::WebWindowFeatures& window_features);
   virtual WebKit::WebWidget* createPopupMenu(WebKit::WebPopupType popup_type);
   virtual WebKit::WebWidget* createPopupMenu(
       const WebKit::WebPopupMenuInfo& info);