Merge branch 'master' of https://github.com/lazyboy/chromium

fsamuel · Apr 15, 2013 · cbced19 · cbced19
2 parents 7b433ca + b8ff168
commit cbced19
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 0 deletions.
diff --git a/tests/chrome-apps/dimension/README b/tests/chrome-apps/dimension/README
@@ -0,0 +1 @@
+Chrome apps sample.
diff --git a/tests/chrome-apps/dimension/main.html b/tests/chrome-apps/dimension/main.html
@@ -0,0 +1,15 @@
+<!--
+ * Copyright 2013 The Chromium Authors. All rights reserved.  Use of this
+ * source code is governed by a BSD-style license that can be found in the
+ * LICENSE file.
+-->
+<html>
+<head>
+</head>
+<body>
+<div>
+  Hello world
+</div>
+<div style="width: 800px; background-color: green; min-height: 200px;">Green background</div>
+</body>
+</html>
diff --git a/tests/chrome-apps/dimension/manifest.json b/tests/chrome-apps/dimension/manifest.json
@@ -0,0 +1,13 @@
+{
+  "manifest_version": 2,
+  "name": "Dimension check",
+  "version": "1",
+  "minimum_chrome_version": "23",
+  "permissions": [
+  ],
+  "app": {
+    "background": {
+      "scripts": ["test.js"]
+    }
+  }
+}
diff --git a/tests/chrome-apps/dimension/test.js b/tests/chrome-apps/dimension/test.js
@@ -0,0 +1,10 @@
+/**
+ * Listens for the app launching then creates the window
+ *
+ * @see http://developer.chrome.com/trunk/apps/app.runtime.html
+ * @see http://developer.chrome.com/trunk/apps/app.window.html
+ */
+chrome.app.runtime.onLaunched.addListener(function() {
+  chrome.app.window.create('main.html',
+    {width: 500, height: 400, id: 'create-app-window-option-id'});
+});