summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-28 00:52:23 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-28 00:52:23 +0000
commit18e861ee07493840a78f0bbd99d28fbe8d5222fc (patch)
tree9a8cf97fa95d6c58f397fb3340abb4c22658de53
parent040753afb6f83cb56843b2a28dd66ec3cac74261 (diff)
downloadchromium_src-18e861ee07493840a78f0bbd99d28fbe8d5222fc.zip
chromium_src-18e861ee07493840a78f0bbd99d28fbe8d5222fc.tar.gz
chromium_src-18e861ee07493840a78f0bbd99d28fbe8d5222fc.tar.bz2
Brain is jello.
TBR=mkearney@chromium.org Review URL: https://chromiumcodereview.appspot.com/10703017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat
-rw-r--r--chrome/common/extensions/docs/apps/fileSystem.html28
-rw-r--r--chrome/common/extensions/docs/apps/known_issues.html28
-rw-r--r--chrome/common/extensions/docs/images/calculator-128.pngbin0 -> 16537 bytes
-rw-r--r--chrome/common/extensions/docs/images/calculator-16.pngbin0 -> 1049 bytes
-rwxr-xr-xchrome/common/extensions/docs/server/main.py3
-rw-r--r--chrome/common/extensions/docs/static/events.html2
-rw-r--r--chrome/common/extensions/docs/static/first_app.html6
-rw-r--r--chrome/common/extensions/docs/static/storage.html2
-rw-r--r--chrome/common/extensions/docs/template/api_template_apps.html2
9 files changed, 65 insertions, 6 deletions
diff --git a/chrome/common/extensions/docs/apps/fileSystem.html b/chrome/common/extensions/docs/apps/fileSystem.html
new file mode 100644
index 0000000..3469124
--- /dev/null
+++ b/chrome/common/extensions/docs/apps/fileSystem.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<!-- This page is a placeholder for generated extensions api doc. Note:
+ 1) The <head> information in this page is significant, should be uniform
+ across api docs and should be edited only with knowledge of the
+ templating mechanism.
+ 3) All <body>.innerHTML is genereated as an rendering step. If viewed in a
+ browser, it will be re-generated from the template, json schema and
+ authored overview content.
+ 4) The <body>.innerHTML is also generated by an offline step so that this
+ page may easily be indexed by search engines.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <link href="../css/print.css" rel="stylesheet" type="text/css" media="print">
+ <script type="text/javascript"
+ src="../../../../third_party/jstemplate/jstemplate_compiled.js">
+ </script>
+ <script type="text/javascript"
+ src="../../../../../third_party/json_minify/minify-sans-regexp.js">
+ </script>
+ <script type="text/javascript" src="../js/api_page_generator.js"></script>
+ <script type="text/javascript" src="../js/bootstrap.js"></script>
+ <script type="text/javascript" src="../js/sidebar.js"></script>
+ </head>
+ <body>
+ </body>
+</html>
diff --git a/chrome/common/extensions/docs/apps/known_issues.html b/chrome/common/extensions/docs/apps/known_issues.html
new file mode 100644
index 0000000..3469124
--- /dev/null
+++ b/chrome/common/extensions/docs/apps/known_issues.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<!-- This page is a placeholder for generated extensions api doc. Note:
+ 1) The <head> information in this page is significant, should be uniform
+ across api docs and should be edited only with knowledge of the
+ templating mechanism.
+ 3) All <body>.innerHTML is genereated as an rendering step. If viewed in a
+ browser, it will be re-generated from the template, json schema and
+ authored overview content.
+ 4) The <body>.innerHTML is also generated by an offline step so that this
+ page may easily be indexed by search engines.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <link href="../css/print.css" rel="stylesheet" type="text/css" media="print">
+ <script type="text/javascript"
+ src="../../../../third_party/jstemplate/jstemplate_compiled.js">
+ </script>
+ <script type="text/javascript"
+ src="../../../../../third_party/json_minify/minify-sans-regexp.js">
+ </script>
+ <script type="text/javascript" src="../js/api_page_generator.js"></script>
+ <script type="text/javascript" src="../js/bootstrap.js"></script>
+ <script type="text/javascript" src="../js/sidebar.js"></script>
+ </head>
+ <body>
+ </body>
+</html>
diff --git a/chrome/common/extensions/docs/images/calculator-128.png b/chrome/common/extensions/docs/images/calculator-128.png
new file mode 100644
index 0000000..85963f3
--- /dev/null
+++ b/chrome/common/extensions/docs/images/calculator-128.png
Binary files differ
diff --git a/chrome/common/extensions/docs/images/calculator-16.png b/chrome/common/extensions/docs/images/calculator-16.png
new file mode 100644
index 0000000..0d9135e
--- /dev/null
+++ b/chrome/common/extensions/docs/images/calculator-16.png
Binary files differ
diff --git a/chrome/common/extensions/docs/server/main.py b/chrome/common/extensions/docs/server/main.py
index 2f7d2a8..154526a 100755
--- a/chrome/common/extensions/docs/server/main.py
+++ b/chrome/common/extensions/docs/server/main.py
@@ -152,7 +152,8 @@ class MainPage(webapp.RequestHandler):
return False
# TODO(aa): Remove this soon.
- if len(self.path) > 1 and self.path[1] == 'apps':
+ if (len(self.path) > 1 and self.path[1] == 'apps' and
+ not self.request.url.startswith('http://localhost')):
return False
return self.redirectToIndexIfNecessary()
diff --git a/chrome/common/extensions/docs/static/events.html b/chrome/common/extensions/docs/static/events.html
index 83e1341..9c23b53 100644
--- a/chrome/common/extensions/docs/static/events.html
+++ b/chrome/common/extensions/docs/static/events.html
@@ -32,6 +32,7 @@ that has details about the newly created tab.
</p>
+<div class="doc-family extensions">
<h2 id="declarative">Declarative Event Handlers</h2>
<p>
@@ -152,3 +153,4 @@ function getRules(rule_ids, function callback(details) {...});
The <code>details</code> parameter passed to the <code>calback()</code> function
refers to an array of rules including filled optional parameters.
</p>
+</div>
diff --git a/chrome/common/extensions/docs/static/first_app.html b/chrome/common/extensions/docs/static/first_app.html
index e8e4ee7..4a2861b 100644
--- a/chrome/common/extensions/docs/static/first_app.html
+++ b/chrome/common/extensions/docs/static/first_app.html
@@ -54,7 +54,7 @@ describes this manifest in detail):
}
},
"permissions": ["experimental", "appWindow"],
- "icons": { "16": "icon-16.png", "128": "icon-128.png" }
+ "icons": { "16": "calculator-16.png", "128": "calculator-128.png" }
}
</pre>
@@ -114,8 +114,8 @@ Copy these icons to your app folder:
</p>
<ul>
- <li><a href="../images/icon-16.png">icon-16.png</a></li>
- <li><a href="../images/icon-128.png">icon-128.png</a></li>
+ <li><a href="../images/calculator-16.png">calculator-16.png</a></li>
+ <li><a href="../images/calculator-128.png">calculator-128.png</a></li>
</ul>
<h2 id="five">Step 5: Launch your app</h2>
diff --git a/chrome/common/extensions/docs/static/storage.html b/chrome/common/extensions/docs/static/storage.html
index 7208360..02065f8 100644
--- a/chrome/common/extensions/docs/static/storage.html
+++ b/chrome/common/extensions/docs/static/storage.html
@@ -18,7 +18,7 @@ with the following key differences:
without the need for a background page.</li>
<li>A user's extension settings can be persisted
even when using
- <a href="http://code.google.com/chrome/extensions/manifest.html#incognito">split incognito behavior</a>.</li>
+ <a href="manifest.html#incognito">split incognito behavior</a>.</li>
<li>User data can be stored as objects
(the <code>localStorage API</code> stores data in strings).</li>
</ul>
diff --git a/chrome/common/extensions/docs/template/api_template_apps.html b/chrome/common/extensions/docs/template/api_template_apps.html
index 7834200..590afa0 100644
--- a/chrome/common/extensions/docs/template/api_template_apps.html
+++ b/chrome/common/extensions/docs/template/api_template_apps.html
@@ -202,7 +202,7 @@
<img class="gsc-search-button-lens" src="../images/search.png" alt="Search">
</button>
<br>
- <span class="greytext">e.g. "page action" or "tabs"</span>
+ <span class="greytext">e.g. "event page" or "alarms"</span>
</div>
</form>
generated by cgit v1.1 at 2025-02-04 05:30:26 +0000