diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 10:12:56 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 10:12:56 +0000 |
| commit | 614c0e1af7f8fd4c8702db4a5f0f24e933aec072 (patch) | |
| tree | e372cf308c6ead3ca3845163d1ef2e0e78db403f /chrome/test | |
| parent | af8136c662ddc427e4df41425c52f2b2cec871b2 (diff) | |
| download | chromium_src-614c0e1af7f8fd4c8702db4a5f0f24e933aec072.zip chromium_src-614c0e1af7f8fd4c8702db4a5f0f24e933aec072.tar.gz chromium_src-614c0e1af7f8fd4c8702db4a5f0f24e933aec072.tar.bz2 | |
Adds GeolocationContentSettings on TabContents.
This data structure and the notification flow will be used to populate the location bar icon and its bubble.
- this was originally part of http://codereview.chromium.org/650180
- Fully reviewed as http://codereview.chromium.org/1143002 I'm just landing on Marcus's behalf
TBR=bulach
BUG=11246
TEST=geolocation_browsertest.cc
Review URL: http://codereview.chromium.org/1320005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42594 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rwxr-xr-x | chrome/test/data/geolocation/iframes_different_origin.html | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/chrome/test/data/geolocation/iframes_different_origin.html b/chrome/test/data/geolocation/iframes_different_origin.html index 076aa64..80d147c 100755 --- a/chrome/test/data/geolocation/iframes_different_origin.html +++ b/chrome/test/data/geolocation/iframes_different_origin.html @@ -1,20 +1,23 @@ -<html>
-<script>
-var iframe_hosts = ['http://127.0.0.1', 'http://localhost'];
+<html> +<script> +var iframe_hosts = ['http://127.0.0.1', 'http://localhost']; +function getIFrameSrc(iframe_id) { + var port = location.port; + var path = location.pathname.substring(0, location.pathname.lastIndexOf('/')); + var url = iframe_hosts[iframe_id] + ':' + port + path + '/simple.html'; + return url; +} function addIFrame(iframe_id) { - var port = location.port;
- var path = location.pathname.substring(0, location.pathname.lastIndexOf('/'));
- var url = iframe_hosts[iframe_id] + ':' + port + path + '/simple.html';
var id = 'iframe_' + iframe_id; var iframe = document.getElementById(id); - iframe.src = url; + iframe.src = getIFrameSrc(iframe_id); return "" + iframe_id; -}
-</script>
+} +</script> <body> <iframe id="iframe_0"></iframe> -<iframe id="iframe_1"></iframe>
-Testing Geolocation with iframes.
-</body>
+<iframe id="iframe_1"></iframe> +Testing Geolocation with iframes. +</body> </html> |