summaryrefslogtreecommitdiffstats
path: root/content/shell
diff options
context:
space:
mode:
authormihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-29 04:03:01 +0000
committermihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-29 04:03:01 +0000
commit03b6d5583ccccfdaba18d8ddca0c8e1d2da10959 (patch)
tree857ee21badbd1260937834fb35ba84254dbb10e5 /content/shell
parent3d552e16b861cb4d37a020b924dda2f4fade036d (diff)
downloadchromium_src-03b6d5583ccccfdaba18d8ddca0c8e1d2da10959.zip
chromium_src-03b6d5583ccccfdaba18d8ddca0c8e1d2da10959.tar.gz
chromium_src-03b6d5583ccccfdaba18d8ddca0c8e1d2da10959.tar.bz2
Make it so that allow_js_access: false can be used with background pages created by window.open.
We want attempts to create those windows to succeed, but the window.open call should still return null. This is accomplished by opening the background contents in another process, in the same manner as r125180. BUG=120446 R=creis@chromium.org Review URL: http://codereview.chromium.org/9837074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129574 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
-rw-r--r--content/shell/shell_content_browser_client.cc4
-rw-r--r--content/shell/shell_content_browser_client.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/content/shell/shell_content_browser_client.cc b/content/shell/shell_content_browser_client.cc
index 632a5d7..588e002 100644
--- a/content/shell/shell_content_browser_client.cc
+++ b/content/shell/shell_content_browser_client.cc
@@ -257,7 +257,9 @@ bool ShellContentBrowserClient::CanCreateWindow(
const GURL& origin,
WindowContainerType container_type,
content::ResourceContext* context,
- int render_process_id) {
+ int render_process_id,
+ bool* no_javascript_access) {
+ *no_javascript_access = false;
return true;
}
diff --git a/content/shell/shell_content_browser_client.h b/content/shell/shell_content_browser_client.h
index 8b25e16..ac5e472 100644
--- a/content/shell/shell_content_browser_client.h
+++ b/content/shell/shell_content_browser_client.h
@@ -146,7 +146,8 @@ class ShellContentBrowserClient : public ContentBrowserClient {
const GURL& origin,
WindowContainerType container_type,
content::ResourceContext* context,
- int render_process_id) OVERRIDE;
+ int render_process_id,
+ bool* no_javascript_access) OVERRIDE;
virtual std::string GetWorkerProcessTitle(
const GURL& url, content::ResourceContext* context) OVERRIDE;
virtual void ResourceDispatcherHostCreated() OVERRIDE;