Skip to content
Browse files

Merge pull request #6867 from dclarke/master

Bug: 814140 fixes
  • Loading branch information...
2 parents 9a9d865 + c48989a commit 0e4afcbd6b70c2485a8054aa8b7c2e5657b968b6 @dclarke dclarke committed Dec 8, 2012
Showing with 41 additions and 1 deletion.
  1. +38 −0 external-apps/mochitest/manifest.webapp
  2. +1 −0 external-apps/mochitest/origin
  3. +2 −1 test_apps/test-container/index.html
View
38 external-apps/mochitest/manifest.webapp
@@ -0,0 +1,38 @@
+{
+ "name": "Mochitest",
+ "description": "Mochitests",
+ "type": "certified",
+ "developer": {
+ "name": "The Ateam",
+ "url": "https://wiki.mozilla.org/Auto-tools"
+ },
+ "permissions": {
+ "alarms": {},
+ "browser":{},
+ "power":{},
+ "webapps-manage":{},
+ "mobileconnection":{},
+ "mozBluetooth":{},
+ "bluetooth":{},
+ "telephony":{},
+ "voicemail":{},
+ "device-storage:pictures":{ "access": "readwrite" },
+ "settings":{ "access": "readwrite" },
+ "storage":{},
+ "camera":{},
+ "geolocation":{},
+ "wifi-manage":{},
+ "wifi":{},
+ "desktop-notification":{},
+ "idle":{},
+ "network-events":{},
+ "embed-apps":{}
+ },
+ "locales": {
+ "en-US": {
+ "name": "Mochitest",
+ "description": "Mochitests"
+ }
+ },
+ "default_locale": "en-US"
+}
View
1 external-apps/mochitest/origin
@@ -0,0 +1 @@
+http://mochi.test:8888/
View
3 test_apps/test-container/index.html
@@ -12,6 +12,7 @@
</style>
</head>
<body>
- <iframe id="test-container" remote="true" mozbrowser></iframe>
+ <iframe id="test-container" mozbrowser mozapp="http://mochi.test:8888/ma
</body>
+
</html>

0 comments on commit 0e4afcb

Please sign in to comment.
Something went wrong with that request. Please try again.