summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--content/renderer/render_view_impl.cc11
-rw-r--r--content/renderer/render_view_impl.h7
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.cc9
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.h7
4 files changed, 34 insertions, 0 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 7329426..d134a60 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1427,6 +1427,17 @@ bool RenderViewImpl::SendAndRunNestedMessageLoop(IPC::SyncMessage* message) {
// WebKit::WebViewClient ------------------------------------------------------
+// TODO(creis): New contract for createView temporarily redirects to the old
+// contract. Remove the old one as part of http://crbug.com/69267.
+WebView* RenderViewImpl::createView(
+ WebFrame* creator,
+ const WebURLRequest& request,
+ const WebWindowFeatures& features,
+ const WebString& frame_name,
+ WebNavigationPolicy policy) {
+ return createView(creator, request, features, frame_name);
+}
+
WebView* RenderViewImpl::createView(
WebFrame* creator,
const WebURLRequest& request,
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index bde2177..6fe21ad 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -338,6 +338,13 @@ class RenderViewImpl : public RenderWidget,
WebKit::WebFrame* creator,
const WebKit::WebURLRequest& request,
const WebKit::WebWindowFeatures& features,
+ const WebKit::WebString& frame_name,
+ WebKit::WebNavigationPolicy policy);
+ // TODO(creis): Remove as part of http://crbug.com/69267.
+ virtual WebKit::WebView* createView(
+ WebKit::WebFrame* creator,
+ const WebKit::WebURLRequest& request,
+ const WebKit::WebWindowFeatures& features,
const WebKit::WebString& frame_name);
virtual WebKit::WebWidget* createPopupMenu(WebKit::WebPopupType popup_type);
virtual WebKit::WebWidget* createPopupMenu(
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 573dba5..dc62a70f 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -318,6 +318,15 @@ void TestWebViewDelegate::SetAuthorAndUserStylesEnabled(bool is_enabled) {
}
// WebViewClient -------------------------------------------------------------
+// TODO(creis): Remove as part of http://crbug.com/69267.
+WebView* TestWebViewDelegate::createView(
+ WebFrame* creator,
+ const WebURLRequest& request,
+ const WebWindowFeatures& window_features,
+ const WebString& frame_name,
+ WebNavigationPolicy policy) {
+ return createView(creator, request, window_features, frame_name);
+}
WebView* TestWebViewDelegate::createView(
WebFrame* creator,
const WebURLRequest& request,
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index 793f3c0..95b7296 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -82,6 +82,13 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
WebKit::WebFrame* creator,
const WebKit::WebURLRequest& request,
const WebKit::WebWindowFeatures& features,
+ const WebKit::WebString& frame_name,
+ WebKit::WebNavigationPolicy policy);
+ // TODO(creis): Remove as part of http://crbug.com/69267.
+ virtual WebKit::WebView* createView(
+ WebKit::WebFrame* creator,
+ const WebKit::WebURLRequest& request,
+ const WebKit::WebWindowFeatures& features,
const WebKit::WebString& frame_name);
virtual WebKit::WebWidget* createPopupMenu(WebKit::WebPopupType popup_type);
virtual WebKit::WebWidget* createPopupMenu(