summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorrafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-28 22:53:11 +0000
committerrafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-28 22:53:11 +0000
commit534c66c7338db94220b0f5995b299415d99e918e (patch)
treeaf5c53e617901fa64ddd0478f133e091724c7d8f /chrome/browser/extensions
parent121de344c56a98dcb82612b7f789d70eb646b592 (diff)
downloadchromium_src-534c66c7338db94220b0f5995b299415d99e918e.zip
chromium_src-534c66c7338db94220b0f5995b299415d99e918e.tar.gz
chromium_src-534c66c7338db94220b0f5995b299415d99e918e.tar.bz2
This is the second side of a multi-sided webkit patch that will allow experimental window.open feature strings to be captured and passed to the client.
It should wait for: https://bugs.webkit.org/show_bug.cgi?id=38013 to land. This is required because this patch needs to use the WebWindowFeature binding struct in WebKit. Once this is landed, a webkit patch to change the call signature for WebViewClient::createView to include the WebWindowFeatures will be submitted (and after that another chromium patch to remove the old call signature). This patch implements old and new WebViewClient::createView signatures, and additionally passes the vector all the way to RenderViewHostDelegateHelper who will eventually use it to observe the 'background' feature. BUG=41275 TEST=all tests should pass Review URL: http://codereview.chromium.org/1758004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45877 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_host.cc7
-rw-r--r--chrome/browser/extensions/extension_host.h4
2 files changed, 8 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
index 234e352..1d7de596 100644
--- a/chrome/browser/extensions/extension_host.cc
+++ b/chrome/browser/extensions/extension_host.cc
@@ -544,10 +544,13 @@ RenderViewHostDelegate::View* ExtensionHost::GetViewDelegate() {
return this;
}
-void ExtensionHost::CreateNewWindow(int route_id) {
+void ExtensionHost::CreateNewWindow(
+ int route_id,
+ WindowContainerType window_container_type) {
delegate_view_helper_.CreateNewWindow(
route_id, render_view_host()->process()->profile(),
- site_instance(), DOMUIFactory::GetDOMUIType(url_), NULL);
+ site_instance(), DOMUIFactory::GetDOMUIType(url_), NULL,
+ window_container_type);
}
void ExtensionHost::CreateNewWidget(int route_id,
diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h
index da3cdd0..39d2f8b 100644
--- a/chrome/browser/extensions/extension_host.h
+++ b/chrome/browser/extensions/extension_host.h
@@ -142,7 +142,9 @@ class ExtensionHost : public RenderViewHostDelegate,
virtual RendererPreferences GetRendererPrefs(Profile* profile) const;
// RenderViewHostDelegate::View
- virtual void CreateNewWindow(int route_id);
+ virtual void CreateNewWindow(
+ int route_id,
+ WindowContainerType window_container_type);
virtual void CreateNewWidget(int route_id, WebKit::WebPopupType popup_type);
virtual void ShowCreatedWindow(int route_id,
WindowOpenDisposition disposition,