diff options
author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-12 02:47:26 +0000 |
---|---|---|
committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-12 02:47:26 +0000 |
commit | 8ab0465a0a52812b600580540a69ba4687e4ef22 (patch) | |
tree | 12c5483360d5174a2906e84234f4d3db72d8471d /webkit | |
parent | 69a83853994057c9bb81fbc8e184cf36650293db (diff) | |
download | chromium_src-8ab0465a0a52812b600580540a69ba4687e4ef22.zip chromium_src-8ab0465a0a52812b600580540a69ba4687e4ef22.tar.gz chromium_src-8ab0465a0a52812b600580540a69ba4687e4ef22.tar.bz2 |
Added plumbing to transport the frame name between RenderViewHost and the Webkit layer.
Extended ViewMsg_New and ViewHostMsg_CreateWindow to have a new frame_name
parameter. This allows the RVH to know the initial name of the frame associated
with its RenderView, and also to set the name of the frame when creating a new
RenderView.
Review URL: http://codereview.chromium.org/2775003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 9 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.h | 5 |
2 files changed, 13 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 19dea28..9aa3c26 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -316,13 +316,20 @@ void TestWebViewDelegate::SetAuthorAndUserStylesEnabled(bool is_enabled) { } // WebViewClient ------------------------------------------------------------- - +// TODO(atwilson): Remove this API when we push related changes upstream WebView* TestWebViewDelegate::createView( WebFrame* creator, const WebWindowFeatures& window_features) { return shell_->CreateWebView(); } +WebView* TestWebViewDelegate::createView( + WebFrame* creator, + const WebWindowFeatures& window_features, + const WebString& frame_name) { + return shell_->CreateWebView(); +} + WebWidget* TestWebViewDelegate::createPopupMenu(WebPopupType popup_type) { // TODO(darin): Should we take into account |popup_type| (for activation // purpose)? diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h index 1d1c4eb..a96049a42 100644 --- a/webkit/tools/test_shell/test_webview_delegate.h +++ b/webkit/tools/test_shell/test_webview_delegate.h @@ -76,9 +76,14 @@ class TestWebViewDelegate : public WebKit::WebViewClient, typedef std::vector<CapturedContextMenuEvent> CapturedContextMenuEvents; // WebKit::WebViewClient + // TODO(atwilson): Remove this API when we push related changes upstream virtual WebKit::WebView* createView( WebKit::WebFrame* creator, const WebKit::WebWindowFeatures& window_features); + virtual WebKit::WebView* createView( + WebKit::WebFrame* creator, + 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); |