diff options
author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 10:49:27 +0000 |
---|---|---|
committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 10:49:27 +0000 |
commit | 844acf37c8a3634c4fc548a363bf37ef98a24523 (patch) | |
tree | 0689e09a8132389eaa3ed796ad80622ee18f74a9 /webkit/tools | |
parent | 515f2492fbc0a023eb089e91e349106da325de5e (diff) | |
download | chromium_src-844acf37c8a3634c4fc548a363bf37ef98a24523.zip chromium_src-844acf37c8a3634c4fc548a363bf37ef98a24523.tar.gz chromium_src-844acf37c8a3634c4fc548a363bf37ef98a24523.tar.bz2 |
Use the new WebViewClient::createView signature.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6304003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71432 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 9 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.h | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index fccf8e7..305fa1f 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -329,10 +329,19 @@ void TestWebViewDelegate::SetAuthorAndUserStylesEnabled(bool is_enabled) { } // WebViewClient ------------------------------------------------------------- +// TODO(jochen): remove once webkit side is up to date. WebView* TestWebViewDelegate::createView( WebFrame* creator, const WebWindowFeatures& window_features, const WebString& frame_name) { + return createView(creator, WebURLRequest(), window_features, frame_name); +} + +WebView* TestWebViewDelegate::createView( + WebFrame* creator, + const WebURLRequest& request, + const WebWindowFeatures& window_features, + const WebString& frame_name) { return shell_->CreateWebView(); } diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h index b3a601e..ca0ad01 100644 --- a/webkit/tools/test_shell/test_webview_delegate.h +++ b/webkit/tools/test_shell/test_webview_delegate.h @@ -79,10 +79,16 @@ class TestWebViewDelegate : public WebKit::WebViewClient, typedef std::vector<CapturedContextMenuEvent> CapturedContextMenuEvents; // WebKit::WebViewClient + // TODO(jochen): remove once webkit side is up to date. virtual WebKit::WebView* createView( WebKit::WebFrame* creator, const WebKit::WebWindowFeatures& features, const WebKit::WebString& frame_name); + 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( const WebKit::WebPopupMenuInfo& info); |