summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-16 09:25:24 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-16 09:25:24 +0000
commitea6ac8a0e88d6bfd2d5fa0d4a9ea165238f4c1fa (patch)
treede537899c8e16840f05949986ae6c1cfcc047bbc /chrome/common
parent7b021236c755ec18b9d9d090bddd1a5a8de46349 (diff)
downloadchromium_src-ea6ac8a0e88d6bfd2d5fa0d4a9ea165238f4c1fa.zip
chromium_src-ea6ac8a0e88d6bfd2d5fa0d4a9ea165238f4c1fa.tar.gz
chromium_src-ea6ac8a0e88d6bfd2d5fa0d4a9ea165238f4c1fa.tar.bz2
Merge 34039 - TBR=erikkay
BUG=none TEST=none Review URL: http://codereview.chromium.org/466068 TBR=kathyw@google.com Review URL: http://codereview.chromium.org/503027 git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@34703 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/extensions/docs/examples/api/override/blank_ntp/blank.html19
-rw-r--r--chrome/common/extensions/docs/examples/api/override/blank_ntp/manifest.json7
-rw-r--r--chrome/common/extensions/docs/images/ntp-blank.pngbin8458 -> 7779 bytes
-rw-r--r--chrome/common/extensions/docs/images/ntp-default.pngbin29001 -> 21154 bytes
-rw-r--r--chrome/common/extensions/docs/override.html6
-rw-r--r--chrome/common/extensions/docs/static/override.html8
6 files changed, 32 insertions, 8 deletions
diff --git a/chrome/common/extensions/docs/examples/api/override/blank_ntp/blank.html b/chrome/common/extensions/docs/examples/api/override/blank_ntp/blank.html
new file mode 100644
index 0000000..87cf3ed
--- /dev/null
+++ b/chrome/common/extensions/docs/examples/api/override/blank_ntp/blank.html
@@ -0,0 +1,19 @@
+<html>
+ <head>
+ <title>Blank New Tab</title>
+ <style>
+ div {
+ color: #cccccc;
+ vertical-align: 50%;
+ text-align: center;
+ font-family: sans-serif;
+ font-size: 300%;
+ }
+ </style>
+ </head>
+ <body>
+ <div style="height:40%"></div>
+ <div>Blank New Tab&trade;</div>
+ </body>
+</html>
+
diff --git a/chrome/common/extensions/docs/examples/api/override/blank_ntp/manifest.json b/chrome/common/extensions/docs/examples/api/override/blank_ntp/manifest.json
new file mode 100644
index 0000000..3ae50ec
--- /dev/null
+++ b/chrome/common/extensions/docs/examples/api/override/blank_ntp/manifest.json
@@ -0,0 +1,7 @@
+{
+ "name": "Blank new tab page",
+ "version": "0.1",
+ "chrome_url_overrides": {
+ "newtab": "blank.html"
+ }
+} \ No newline at end of file
diff --git a/chrome/common/extensions/docs/images/ntp-blank.png b/chrome/common/extensions/docs/images/ntp-blank.png
index bc1691a..c137e34 100644
--- a/chrome/common/extensions/docs/images/ntp-blank.png
+++ b/chrome/common/extensions/docs/images/ntp-blank.png
Binary files differ
diff --git a/chrome/common/extensions/docs/images/ntp-default.png b/chrome/common/extensions/docs/images/ntp-default.png
index f4ecc5c..6b1bad2 100644
--- a/chrome/common/extensions/docs/images/ntp-default.png
+++ b/chrome/common/extensions/docs/images/ntp-default.png
Binary files differ
diff --git a/chrome/common/extensions/docs/override.html b/chrome/common/extensions/docs/override.html
index 6e8f14a..bb79a26 100644
--- a/chrome/common/extensions/docs/override.html
+++ b/chrome/common/extensions/docs/override.html
@@ -306,17 +306,15 @@ when the user creates a new tab or window.
</tr>
<tr>
<td>
- <img src="images/ntp-default.png" alt="default New Tab page">
+ <img src="images/ntp-default.png" alt="default New Tab page" width="200" height="173">
</td>
<td>
- <img src="images/ntp-blank.png" alt="a blank New Tab page">
+ <img src="images/ntp-blank.png" alt="a blank New Tab page" width="200" height="173">
</td>
</tr>
</tbody></table>
-<!-- [PENDING: update these screenshots.] -->
-
<h2 id="manifest">Manifest</h2>
<p>
diff --git a/chrome/common/extensions/docs/static/override.html b/chrome/common/extensions/docs/static/override.html
index 1ef5299..96b6897 100644
--- a/chrome/common/extensions/docs/static/override.html
+++ b/chrome/common/extensions/docs/static/override.html
@@ -44,18 +44,18 @@ when the user creates a new tab or window.
<tr>
<td>
<img src="images/ntp-default.png"
- alt="default New Tab page">
+ alt="default New Tab page"
+ width="200" height="173">
</td>
<td>
<img src="images/ntp-blank.png"
- alt="a blank New Tab page">
+ alt="a blank New Tab page"
+ width="200" height="173">
</td>
</tr>
</table>
-<!-- [PENDING: update these screenshots.] -->
-
<h2 id="manifest">Manifest</h2>
<p>