summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authormihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-30 06:01:38 +0000
committermihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-30 06:01:38 +0000
commit73f5d4d98de1d5a0b486c8cf0e5d3912110bcfdb (patch)
tree02ab6b03b91a0e83211b80e96cc5045a64a1820a /chrome/test
parent118a31109b6cb562b06bbddf3bdf704a08e98a67 (diff)
downloadchromium_src-73f5d4d98de1d5a0b486c8cf0e5d3912110bcfdb.zip
chromium_src-73f5d4d98de1d5a0b486c8cf0e5d3912110bcfdb.tar.gz
chromium_src-73f5d4d98de1d5a0b486c8cf0e5d3912110bcfdb.tar.bz2
When determining whether or not to swap processes on navigation, check the top frame's URL.
Otherwise having an inner frame that matches the app's extent could mean that the process is not swapped, even if we're not in an app process. BUG=89272 TEST=no R=creis@chromium.org Review URL: http://codereview.chromium.org/7537014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/extensions/api_test/app_process/path1/iframe.html3
-rw-r--r--chrome/test/data/extensions/api_test/app_process/path3/container.html1
2 files changed, 4 insertions, 0 deletions
diff --git a/chrome/test/data/extensions/api_test/app_process/path1/iframe.html b/chrome/test/data/extensions/api_test/app_process/path1/iframe.html
new file mode 100644
index 0000000..793c886
--- /dev/null
+++ b/chrome/test/data/extensions/api_test/app_process/path1/iframe.html
@@ -0,0 +1,3 @@
+<script>
+ window.open('/files/extensions/api_test/app_process/path1/empty.html');
+</script>
diff --git a/chrome/test/data/extensions/api_test/app_process/path3/container.html b/chrome/test/data/extensions/api_test/app_process/path3/container.html
new file mode 100644
index 0000000..4eb0967
--- /dev/null
+++ b/chrome/test/data/extensions/api_test/app_process/path3/container.html
@@ -0,0 +1 @@
+<iframe src="/files/extensions/api_test/app_process/path1/iframe.html"></iframe>