summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-01 23:33:39 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-01 23:33:39 +0000
commit5b0ce253b1728530edebbedfb9608a6f479545d9 (patch)
treeba117f719cc5babe4ca392add95c9a1df0dad4bd /chrome/test
parent5e5f41aed47d97e89623075b4caf2071bc9950cc (diff)
downloadchromium_src-5b0ce253b1728530edebbedfb9608a6f479545d9.zip
chromium_src-5b0ce253b1728530edebbedfb9608a6f479545d9.tar.gz
chromium_src-5b0ce253b1728530edebbedfb9608a6f479545d9.tar.bz2
Merge branch 'api' of /src/chrome/src into api
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/extensions/uitest/window_open/manifest.json6
-rw-r--r--chrome/test/data/extensions/uitest/window_open/newtab.html11
-rw-r--r--chrome/test/data/extensions/uitest/window_open/test.html8
3 files changed, 25 insertions, 0 deletions
diff --git a/chrome/test/data/extensions/uitest/window_open/manifest.json b/chrome/test/data/extensions/uitest/window_open/manifest.json
new file mode 100644
index 0000000..bcdc692
--- /dev/null
+++ b/chrome/test/data/extensions/uitest/window_open/manifest.json
@@ -0,0 +1,6 @@
+{
+ "version": "1.0.0.0",
+ "name": "window.open test",
+ "description": "An extension for an extension UITest.",
+ "permissions": ["tabs"]
+}
diff --git a/chrome/test/data/extensions/uitest/window_open/newtab.html b/chrome/test/data/extensions/uitest/window_open/newtab.html
new file mode 100644
index 0000000..db1eb11
--- /dev/null
+++ b/chrome/test/data/extensions/uitest/window_open/newtab.html
@@ -0,0 +1,11 @@
+<script>
+function testExtensionApi() {
+ try {
+ chrome.tabs.getAllInWindow(null, function() {
+ window.domAutomationController.send(true);
+ });
+ } catch (e) {
+ window.domAutomationController.send(false);
+ }
+}
+</script>
diff --git a/chrome/test/data/extensions/uitest/window_open/test.html b/chrome/test/data/extensions/uitest/window_open/test.html
new file mode 100644
index 0000000..c267f19
--- /dev/null
+++ b/chrome/test/data/extensions/uitest/window_open/test.html
@@ -0,0 +1,8 @@
+HOWDIE!!!
+
+<script>
+function testWindowOpen(url) {
+ window.open(url);
+ window.domAutomationController.send(true);
+}
+</script>