summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorcreis@google.com <creis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-05 23:20:27 +0000
committercreis@google.com <creis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-05 23:20:27 +0000
commitffb204f2827d3ce9974c0969fc4f470ab35892aa (patch)
treeccd77a1ea80100e7c8609ce559b6714850934e4f /chrome/test
parentd99bcaae9af32923a53f3c448cf95cbf7ad20775 (diff)
downloadchromium_src-ffb204f2827d3ce9974c0969fc4f470ab35892aa.zip
chromium_src-ffb204f2827d3ce9974c0969fc4f470ab35892aa.tar.gz
chromium_src-ffb204f2827d3ce9974c0969fc4f470ab35892aa.tar.bz2
Show extension tabs in task manager and correctly label apps.
BUG=31526 BUG=60840 TEST=TaskManagerBrowserTest.NoticeExtensionTabs TEST=TaskManagerBrowserTest.NoticeAppTabs Review URL: http://codereview.chromium.org/5526002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68324 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/extensions/packaged_app/main.html7
-rw-r--r--chrome/test/data/extensions/packaged_app/manifest.json9
2 files changed, 16 insertions, 0 deletions
diff --git a/chrome/test/data/extensions/packaged_app/main.html b/chrome/test/data/extensions/packaged_app/main.html
new file mode 100644
index 0000000..a19eb67
--- /dev/null
+++ b/chrome/test/data/extensions/packaged_app/main.html
@@ -0,0 +1,7 @@
+<html>
+<head>
+<title>Packaged App Test</title>
+<body>
+Packaged App Test
+</body>
+</html>
diff --git a/chrome/test/data/extensions/packaged_app/manifest.json b/chrome/test/data/extensions/packaged_app/manifest.json
new file mode 100644
index 0000000..78cef8a
--- /dev/null
+++ b/chrome/test/data/extensions/packaged_app/manifest.json
@@ -0,0 +1,9 @@
+{
+ "name": "Packaged App Test",
+ "version": "1",
+ "app": {
+ "launch": {
+ "local_path": "main.html"
+ }
+ }
+}