Update to new stable branch 1750

This also includes an updated ninja and chromium dependencies
needed on Windows.

Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

69 files changed, 1371 insertions, 0 deletions

diff --git a/chromium/chrome/common/extensions/docs/examples/api/bookmarks/basic/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/bookmarks/basic/manifest.json
new file mode 100644
index 00000000000..2135c3cbf6b
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/bookmarks/basic/manifest.json
@@ -0,0 +1,15 @@
+{
+  "name": "My Bookmarks",
+  "version": "1.1",
+  "description": "A browser action with a popup dump of all bookmarks, including search, add, edit and delete.",
+  "permissions": [
+    "bookmarks"
+  ],
+  "browser_action": {
+      "default_title": "My Bookmarks",
+      "default_icon": "icon.png",
+      "default_popup": "popup.html"
+  },
+  "manifest_version": 2,
+  "content_security_policy": "script-src 'self' https://ajax.googleapis.com; object-src 'self'"
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/browserAction/make_page_red/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/browserAction/make_page_red/manifest.json
new file mode 100644
index 00000000000..b901108730c
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/browserAction/make_page_red/manifest.json
@@ -0,0 +1,16 @@
+{
+  "name": "Page Redder",
+  "description": "Make the current page red",
+  "version": "2.0",
+  "permissions": [
+    "activeTab"
+  ],
+  "background": {
+    "scripts": ["background.js"],
+    "persistent": false
+  },
+  "browser_action": {
+    "default_title": "Make this page red"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/browserAction/print/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/browserAction/print/manifest.json
new file mode 100644
index 00000000000..c4ea105ab79
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/browserAction/print/manifest.json
@@ -0,0 +1,16 @@
+{
+  "name": "Print this page",
+  "description": "Adds a print button to the browser.",
+  "version": "1.1",
+  "background": {
+    "scripts": ["background.js"]
+  },
+  "permissions": [
+    "tabs", "http://*/*", "https://*/*"
+  ],
+  "browser_action": {
+      "default_title": "Print this page",
+      "default_icon": "print_16x16.png"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/manifest.json
new file mode 100644
index 00000000000..3274c344a29
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/manifest.json
@@ -0,0 +1,10 @@
+{
+  "name": "A browser action which changes its icon when clicked",
+  "description": "Change browser action color when its icon is clicked",
+  "version": "1.2",
+  "background": { "scripts": ["background.js"] },
+  "browser_action": {
+      "name": "Click to change the icon's color"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/manifest.json
new file mode 100644
index 00000000000..48f551d9bf5
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/manifest.json
@@ -0,0 +1,14 @@
+{
+  "name": "A browser action with a popup that changes the page color",
+  "description": "Change the current page color",
+  "version": "1.0",
+  "permissions": [
+    "tabs", "http://*/*", "https://*/*"
+  ],
+  "browser_action": {
+      "default_title": "Set this page's color.",
+      "default_icon": "icon.png",
+      "default_popup": "popup.html"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/browsingData/basic/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/browsingData/basic/manifest.json
new file mode 100644
index 00000000000..d2287292ddf
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/browsingData/basic/manifest.json
@@ -0,0 +1,13 @@
+{
+  "name" : "BrowsingData API: Basics",
+  "version" : "1.1",
+  "description" : "A trivial usage example.",
+  "permissions": [
+    "browsingData"
+  ],
+  "browser_action": {
+     "default_icon": "icon.png",
+     "default_popup": "popup.html"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/commands/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/commands/manifest.json
new file mode 100644
index 00000000000..1d13778a908
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/commands/manifest.json
@@ -0,0 +1,25 @@
+{
+  "name": "Sample Extension Commands extension",
+  "description": "Press Ctrl+Shift+F (Command+Shift+F on a Mac) to open the browser action popup, press Ctrl+Shift+Y to send an event (Command+Shift+Y on a Mac).",
+  "version": "1.0",
+  "manifest_version": 2,
+  "background": {
+    "scripts": ["background.js"],
+    "persistent": false
+  },
+  "browser_action": {
+    "default_popup": "browser_action.html"
+  },
+  "commands": {
+    "toggle-feature": {
+      "suggested_key": { "default": "Ctrl+Shift+Y" },
+      "description": "Send a 'toggle-feature' event to the extension"
+    },
+    "_execute_browser_action": {
+      "suggested_key": {
+        "default": "Ctrl+Shift+F",
+        "mac": "MacCtrl+Shift+F"
+      }
+    }
+  }
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/contentSettings/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/contentSettings/manifest.json
new file mode 100644
index 00000000000..adf1daefb52
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/contentSettings/manifest.json
@@ -0,0 +1,11 @@
+{
+  "name" : "Content settings",
+  "version" : "0.2",
+  "description" : "Shows the content settings for the current site.",
+  "permissions": [ "contentSettings", "tabs" ],
+  "browser_action": {
+     "default_icon": "contentSettings.png",
+     "default_popup": "popup.html"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/contextMenus/basic/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/contextMenus/basic/manifest.json
new file mode 100644
index 00000000000..c59cec18d17
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/contextMenus/basic/manifest.json
@@ -0,0 +1,10 @@
+{
+  "name": "Context Menus Sample",
+  "description": "Shows some of the features of the Context Menus API",
+  "version": "0.6",
+  "permissions": ["contextMenus"],
+  "background": {
+    "scripts": ["sample.js"]
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/contextMenus/event_page/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/contextMenus/event_page/manifest.json
new file mode 100644
index 00000000000..8279823db8d
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/contextMenus/event_page/manifest.json
@@ -0,0 +1,11 @@
+{
+  "name": "Context Menus Sample (with Event Page)",
+  "description": "Shows some of the features of the Context Menus API using an event page",
+  "version": "0.7",
+  "permissions": ["contextMenus"],
+  "background": {
+    "persistent": false,
+    "scripts": ["sample.js"]
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/cookies/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/cookies/manifest.json
new file mode 100644
index 00000000000..eb7da26d259
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/cookies/manifest.json
@@ -0,0 +1,14 @@
+{
+  "name" : "Cookie API Test Extension",
+  "version" : "0.8",
+  "description" : "Testing Cookie API",
+  "permissions": [ "cookies", "tabs", "http://*/*", "https://*/*" ],
+  "icons": { "16": "cookie.png", "48": "cookie.png", "128": "cookie.png" },
+  "browser_action": {
+    "default_icon": "cookie.png"
+  },
+  "background": {
+    "scripts": ["background.js"]
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/debugger/live-headers/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/debugger/live-headers/manifest.json
new file mode 100644
index 00000000000..19b6554da4b
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/debugger/live-headers/manifest.json
@@ -0,0 +1,17 @@
+{
+  "name": "Live HTTP headers",
+  "description": "Displays the live log with the http requests headers",
+  "version": "0.7",
+  "permissions": [
+    "debugger"
+  ],
+  "background": {
+    "scripts": ["background.js"]
+  },
+  "browser_action": {
+    "default_icon": "icon.png",
+    "default_title": "Live HTTP headers"
+  },
+  "manifest_version": 2
+}
+
diff --git a/chromium/chrome/common/extensions/docs/examples/api/debugger/pause-resume/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/debugger/pause-resume/manifest.json
new file mode 100644
index 00000000000..fdc7e3d6475
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/debugger/pause-resume/manifest.json
@@ -0,0 +1,16 @@
+{
+  "name": "JavaScript pause/resume",
+  "description": "Pauses / resumes JavaScript execution",
+  "version": "0.7",
+  "permissions": [
+    "debugger"
+  ],
+  "background": {
+    "scripts": ["background.js"]
+  },
+  "browser_action": {
+    "default_icon": "debuggerPause.png",
+    "default_title": "Pause JavaScript"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/desktopCapture/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/desktopCapture/manifest.json
new file mode 100644
index 00000000000..2865eddc0e9
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/desktopCapture/manifest.json
@@ -0,0 +1,18 @@
+{
+  "name": "Desktop Capture Example",
+  "description": "Show desktop media picker UI",
+  "version": "1",
+  "manifest_version": 2,
+  "icons": {
+    "16": "icon.png",
+    "128": "icon.png"
+  },
+  "app": {
+    "background": {
+      "scripts": ["background.js"]
+    }
+  },
+  "permissions": [
+    "desktopCapture"
+  ]
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/deviceInfo/basic/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/deviceInfo/basic/manifest.json
new file mode 100644
index 00000000000..4d376d84c52
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/deviceInfo/basic/manifest.json
@@ -0,0 +1,15 @@
+{
+  "name": "My Devices",
+  "version": "1.1",
+  "description": "A browser action with a popup dump of all devices signed into the same account as the current profile.",
+  "permissions": [
+     "signedInDevices"
+  ],
+  "browser_action": {
+      "default_title": "My Devices",
+      "default_icon": "icon.png",
+      "default_popup": "popup.html"
+  },
+  "manifest_version": 2,
+  "content_security_policy": "script-src 'self' https://ajax.googleapis.com; object-src 'self'"
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/devtools/audits/broken-links/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/devtools/audits/broken-links/manifest.json
new file mode 100644
index 00000000000..ee3b5b7d45d
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/devtools/audits/broken-links/manifest.json
@@ -0,0 +1,16 @@
+{
+  "name": "Broken Links",
+  "version": "1.1",
+  "description": "Extends the Developer Tools, adding an audit category that finds broken links on the inspected page.",
+  "background": {
+    "scripts": ["background.js"]
+  },
+  "devtools_page": "devtools.html",
+  "permissions":  [
+    "experimental",
+    "tabs",
+    "http://*/*",
+    "https://*/*"
+  ],
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/devtools/inspectedWindow/chrome-preprocessor/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/devtools/inspectedWindow/chrome-preprocessor/manifest.json
new file mode 100644
index 00000000000..c07462521d6
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/devtools/inspectedWindow/chrome-preprocessor/manifest.json
@@ -0,0 +1,12 @@
+{
+  "name": "Chrome Preprocessor Example",
+  "version": "0.1",
+  "description": "Simple hello-world example for chrome.devtools.inspectedWindow.reload() using preprocessor.",
+  "devtools_page": "chrome-preprocessor.html",
+  "manifest_version": 2,
+   "content_security_policy": "default-src 'self'  chrome-extension-resource: ; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-eval';  connect-src *; frame-src *;",
+    "web_accessible_resources":
+    [
+      "*"
+    ]
+}
\ No newline at end of file
diff --git a/chromium/chrome/common/extensions/docs/examples/api/devtools/network/chrome-firephp/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/devtools/network/chrome-firephp/manifest.json
new file mode 100644
index 00000000000..275dced7431
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/devtools/network/chrome-firephp/manifest.json
@@ -0,0 +1,13 @@
+{
+  "name": "FirePHP for Chrome",
+  "version": "1.1",
+  "minimum_chrome_version": "10.0",
+  "description": "Extends the Developer Tools, adding support for parsing FirePHP messages from server",
+  "devtools_page": "devtools.html",
+  "background": { "scripts": ["background.js"] },
+  "permissions": [
+    "http://*/*",
+    "https://*/*"
+  ],
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/devtools/panels/chrome-query/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/devtools/panels/chrome-query/manifest.json
new file mode 100644
index 00000000000..a60485d7fbf
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/devtools/panels/chrome-query/manifest.json
@@ -0,0 +1,7 @@
+{
+  "name": "Chrome Query",
+  "version": "1.1",
+  "description": "Extends the Developer Tools, adding a sidebar that displays the jQuery data associated with the selected DOM element.",
+  "devtools_page": "devtools.html",
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/downloads/download_filename_controller/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/downloads/download_filename_controller/manifest.json
new file mode 100644
index 00000000000..dd3fea25537
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/downloads/download_filename_controller/manifest.json
@@ -0,0 +1,8 @@
+{"name": "Download Filename Controller",
+ "description": "Download Filename Controller",
+ "version": "0.1",
+ "background": {"scripts": ["bg.js"], "persistent": false},
+ "options_page": "options.html",
+ "permissions": ["downloads"],
+ "content_security_policy": "script-src 'self' chrome-extension-resource: 'unsafe-eval'; default-src 'self'",
+ "manifest_version": 2}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/downloads/download_links/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/downloads/download_links/manifest.json
new file mode 100644
index 00000000000..f252f0decc0
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/downloads/download_links/manifest.json
@@ -0,0 +1,9 @@
+{
+  "name": "Download Selected Links",
+  "description": "Select links on a page and download them.",
+  "version": "0.1",
+  "minimum_chrome_version": "16.0.884",
+  "permissions": ["downloads", "<all_urls>"],
+  "browser_action": {"default_popup": "popup.html"},
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/downloads/download_manager/_locales/en/messages.json b/chromium/chrome/common/extensions/docs/examples/api/downloads/download_manager/_locales/en/messages.json
new file mode 100644
index 00000000000..83d05e7bf55
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/downloads/download_manager/_locales/en/messages.json
@@ -0,0 +1,290 @@
+{"extName": {
+   "message": "Download Manager Button",
+   "description": "Extension name"},
+ "extDesc": {
+   "message": "Browser Action Download Manager User Interface for Google Chrome",
+   "description": "Extension description"},
+ "badChromeVersion": {
+   "message": "The downloads API is only available on the canary, dev, and beta channels.",
+   "description": ""},
+ "tabTitle": {
+   "message": "Downloads",
+   "description": "tab title"},
+ "searchPlaceholder": {
+   "message": "Search Downloads",
+   "description": ""},
+ "clearAllTitle": {
+   "message": "Erase All Visible Downloads",
+   "description": ""},
+ "openDownloadsFolderTitle": {
+   "message": "Open Downloads Folder",
+   "description": ""},
+ "zeroItems": {
+   "message": "There are zero download items.",
+   "description": ""},
+ "searching": {
+   "message": "Teleporting lots of goats...",
+   "description": ""},
+ "zeroSearchResults": {
+   "message": "Zero matches",
+   "description": ""},
+ "managementPermissionInfo": {
+   "message": "Some files were downloaded by an extension.",
+   "description": ""},
+ "grantManagementPermission": {
+   "message": "Show links to extensions that download files.",
+   "description": ""},
+ "showOlderDownloads": {
+   "message": "Show Older Downloads",
+   "description": ""},
+ "loadingOlderDownloads": {
+   "message": "Loading Older Downloads...",
+   "description": ""},
+ "openTitle": {
+   "message": "Open",
+   "description": ""},
+ "pauseTitle": {
+   "message": "Pause",
+   "description": ""},
+ "resumeTitle": {
+   "message": "Resume",
+   "description": ""},
+ "cancelTitle": {
+   "message": "Cancel",
+   "description": ""},
+ "removeFileTitle": {
+   "message": "Remove file",
+   "description": ""},
+ "eraseTitle": {
+   "message": "Erase",
+   "description": ""},
+ "retryTitle": {
+   "message": "Retry",
+   "description": ""},
+ "referrerTitle": {
+   "message": "Referrer",
+   "description": ""},
+ "month0abbr": {"message": "Jan","description": ""},
+ "month1abbr": {"message": "Feb","description": ""},
+ "month2abbr": {"message": "Mar","description": ""},
+ "month3abbr": {"message": "Apr","description": ""},
+ "month4abbr": {"message": "May","description": ""},
+ "month5abbr": {"message": "Jun","description": ""},
+ "month6abbr": {"message": "Jul","description": ""},
+ "month7abbr": {"message": "Aug","description": ""},
+ "month8abbr": {"message": "Sep","description": ""},
+ "month9abbr": {"message": "Oct","description": ""},
+ "month10abbr": {"message": "Nov","description": ""},
+ "month11abbr": {"message": "Dec","description": ""},
+ "openWhenCompleteFinishing": {
+   "message": "Opening in just a moment",
+   "description": ""},
+ "timeLeftFinishing": {
+   "message": "finishing...",
+   "description": ""},
+ "openWhenCompleteDays": {
+   "message": "Opening in $days$d $hours$h",
+   "description": "",
+   "placeholders": {
+     "days": {
+       "content": "$1",
+       "example": "2"},
+     "hours": {
+       "content": "$2",
+       "example": "23"}}},
+ "timeLeftDays": {
+   "message": "$days$d $hours$h left",
+   "description": "",
+   "placeholders": {
+     "days": {
+       "content": "$1",
+       "example": "2"},
+     "hours": {
+       "content": "$2",
+       "example": "23"}}},
+ "openWhenCompleteHours": {
+   "message": "Opening in $hours$h $mins$m",
+   "description": "",
+   "placeholders": {
+     "hours": {
+       "content": "$1",
+       "example": "23"},
+     "mins": {
+       "content": "$2",
+       "example": "59"}}},
+ "timeLeftHours": {
+   "message": "$hours$h $mins$m left",
+   "description": "",
+   "placeholders": {
+     "hours": {
+       "content": "$1",
+       "example": "23"},
+     "mins": {
+       "content": "$2",
+       "example": "59"}}},
+ "openWhenCompleteMinutes": {
+   "message": "Opening in $mins$m $sec$s",
+   "description": "",
+   "placeholders": {
+     "mins": {
+       "content": "$1",
+       "example": "59"},
+     "sec": {
+       "content": "$2",
+       "example": "59"}}},
+ "timeLeftMinutes": {
+   "message": "$mins$m $sec$s left",
+   "description": "",
+   "placeholders": {
+     "mins": {
+       "content": "$1",
+       "example": "59"},
+     "sec": {
+       "content": "$2",
+       "example": "59"}}},
+ "openWhenCompleteSeconds": {
+   "message": "Opening in $sec$s",
+   "description": "",
+   "placeholders": {
+     "sec": {
+       "content": "$1",
+       "example": "59"}}},
+ "timeLeftSeconds": {
+   "message": "$sec$s left",
+   "description": "",
+   "placeholders": {
+     "sec": {
+       "content": "$1",
+       "example": "59"}}},
+ "error_FILE_FAILED": {
+   "message": "File Failed",
+   "description": ""},
+ "error_FILE_ACCESS_DENIED": {
+   "message": "File-System Access Denied",
+   "description": ""},
+ "error_FILE_NO_SPACE": {
+   "message": "No Space On Disk",
+   "description": ""},
+ "error_FILE_NAME_TOO_LONG": {
+   "message": "Filename Too Long",
+   "description": ""},
+ "error_FILE_TOO_LARGE": {
+   "message": "File Too Large",
+   "description": ""},
+ "error_FILE_VIRUS_INFECTED": {
+   "message": "Virus Infected",
+   "description": ""},
+ "error_FILE_TRANSIENT_ERROR": {
+   "message": "Transient File-System Error",
+   "description": ""},
+ "error_FILE_BLOCKED": {
+   "message": "File Blocked",
+   "description": ""},
+ "error_FILE_SECURITY_CHECK_FAILED": {
+   "message": "Security Check Failed",
+   "description": ""},
+ "error_FILE_TOO_SHORT": {
+   "message": "File Too Short",
+   "description": ""},
+ "error_NETWORK_FAILED": {
+   "message": "Network Failure",
+   "description": ""},
+ "error_NETWORK_TIMEOUT": {
+   "message": "Network Timeout",
+   "description": ""},
+ "error_NETWORK_DISCONNECTED": {
+   "message": "Network Disconnected",
+   "description": ""},
+ "error_NETWORK_SERVER_DOWN": {
+   "message": "Server Down",
+   "description": ""},
+ "error_SERVER_FAILED": {
+   "message": "Server Failure",
+   "description": ""},
+ "error_SERVER_NO_RANGE": {
+   "message": "Server No Range",
+   "description": ""},
+ "error_SERVER_PRECONDITION": {
+   "message": "Server Precondition Failure",
+   "description": ""},
+ "error_SERVER_BAD_CONTENT": {
+   "message": "Bad Content",
+   "description": ""},
+ "error_USER_CANCELED": {
+   "message": "Cancelled",
+   "description": ""},
+ "error_USER_SHUTDOWN": {
+   "message": "Cancelled",
+   "description": ""},
+ "error_CRASH": {
+   "message": "Crash",
+   "description": ""},
+ "error_1": {
+   "message": "File Failed",
+   "description": ""},
+ "error_2": {
+   "message": "File-System Access Denied",
+   "description": ""},
+ "error_3": {
+   "message": "No Space On Disk",
+   "description": ""},
+ "error_5": {
+   "message": "Filename Too Long",
+   "description": ""},
+ "error_6": {
+   "message": "File Too Large",
+   "description": ""},
+ "error_7": {
+   "message": "Virus Infected",
+   "description": ""},
+ "error_10": {
+   "message": "Transient File-System Error",
+   "description": ""},
+ "error_11": {
+   "message": "File Blocked",
+   "description": ""},
+ "error_12": {
+   "message": "Security Check Failed",
+   "description": ""},
+ "error_13": {
+   "message": "File Too Short",
+   "description": ""},
+ "error_20": {
+   "message": "Network Failure",
+   "description": ""},
+ "error_21": {
+   "message": "Network Timeout",
+   "description": ""},
+ "error_22": {
+   "message": "Network Disconnected",
+   "description": ""},
+ "error_23": {
+   "message": "Server Down",
+   "description": ""},
+ "error_30": {
+   "message": "Server Failure",
+   "description": ""},
+ "error_31": {
+   "message": "Server No Range",
+   "description": ""},
+ "error_32": {
+   "message": "Server Precondition Failure",
+   "description": ""},
+ "error_33": {
+   "message": "Bad Content",
+   "description": ""},
+ "error_40": {
+   "message": "Cancelled",
+   "description": ""},
+ "error_41": {
+   "message": "Cancelled",
+   "description": ""},
+ "error_50": {
+   "message": "Crash",
+   "description": ""},
+ "errorRemoved": {
+   "message": "Removed",
+   "description": ""},
+ "showInFolderTitle": {
+   "message": "Show in Folder",
+   "description": "Alt text for show in folder icon"}}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/downloads/download_manager/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/downloads/download_manager/manifest.json
new file mode 100644
index 00000000000..156e69c124f
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/downloads/download_manager/manifest.json
@@ -0,0 +1,15 @@
+{"name": "__MSG_extName__",
+ "version": "0.3",
+ "manifest_version": 2,
+ "description": "__MSG_extDesc__",
+ "icons": {"128": "icon128.png"},
+ "browser_action": {
+   "default_icon": {
+     "19": "icon19.png",
+     "38": "icon38.png"},
+   "default_title": "__MSG_extName__",
+   "default_popup": "popup.html"},
+ "background": {"persistent": false, "scripts": ["background.js"]},
+ "default_locale": "en",
+ "optional_permissions": ["management"],
+ "permissions": ["downloads", "downloads.open", "downloads.shelf"]}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/downloads/download_open/_locales/en/messages.json b/chromium/chrome/common/extensions/docs/examples/api/downloads/download_open/_locales/en/messages.json
new file mode 100644
index 00000000000..eae1fbe9a55
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/downloads/download_open/_locales/en/messages.json
@@ -0,0 +1,9 @@
+{"extName": {
+   "message": "Download and Open Button",
+   "description": "Extension name"},
+ "extDesc": {
+   "message": "Download and Open Context Menu Button",
+   "description": "Extension description"},
+ "openContextMenuTitle": {
+   "message": "Download and Open",
+   "description": "context menu button text"}}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/downloads/download_open/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/downloads/download_open/manifest.json
new file mode 100644
index 00000000000..98a49ab74e4
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/downloads/download_open/manifest.json
@@ -0,0 +1,8 @@
+{"name": "__MSG_extName__",
+ "version": "0.1",
+ "manifest_version": 2,
+ "description": "__MSG_extDesc__",
+ "icons": {"16": "icon16.png", "128": "icon128.png"},
+ "background": {"persistent": false, "scripts": ["background.js"]},
+ "default_locale": "en",
+ "permissions": ["contextMenus", "downloads", "downloads.open"]}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/downloads/downloads_overwrite/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/downloads/downloads_overwrite/manifest.json
new file mode 100644
index 00000000000..c1f8999dd8d
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/downloads/downloads_overwrite/manifest.json
@@ -0,0 +1,14 @@
+{
+  "name": "Downloads Overwrite Existing Files",
+  "description": "All downloads overwrite existing files instead of adding ' (1)', ' (2)', etc.",
+  "version": "1",
+  "minimum_chrome_version": "26.0.1428",
+  "background": {
+    "scripts": ["bg.js"],
+    "persistent": false
+  },
+  "permissions": [
+    "downloads"
+  ],
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/eventPage/basic/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/eventPage/basic/manifest.json
new file mode 100644
index 00000000000..7a6e1f43d87
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/eventPage/basic/manifest.json
@@ -0,0 +1,24 @@
+{
+  "name": "Event Page Example",
+  "description": "Demonstrates usage and features of the event page",
+  "version": "1.0",
+  "manifest_version": 2,
+  "permissions": ["alarms", "tabs", "bookmarks", "declarativeWebRequest", "*://*/*"],
+  "background": {
+    "scripts": ["background.js"],
+    "persistent": false
+  },
+  "browser_action": {
+    "default_icon" : "icon.png",
+    "default_title": "Start Event Page"
+  },
+  "commands": {
+    "open-google": {
+      "description": "Open a tab to google.com",
+      "suggested_key": { "default": "Ctrl+Shift+L" }
+    },
+    "_execute_browser_action": {
+      "suggested_key": { "default": "Ctrl+Shift+K" }
+    }
+  }
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/extension/isAllowedAccess/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/extension/isAllowedAccess/manifest.json
new file mode 100644
index 00000000000..66241fc37bf
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/extension/isAllowedAccess/manifest.json
@@ -0,0 +1,16 @@
+{
+  "name" : "`extension.isAllowedFileSchemeAccess` and `extension.isAllowedIncognitoAccess` Example",
+  "version" : "1.0.0",
+  "description" : "Demonstrates the `extension.isAllowedFileSchemeAccess` and `extesion.isAllowedIncognitoAccess` APIs",
+  "permissions" : [ "file://*" ],
+  "browser_action" : {
+    "default_popup": "popup.html",
+    "default_icon" : "sample-19.png"
+  },
+  "icons" : {
+    "16" : "sample-16.png",
+    "48" : "sample-48.png",
+    "128" : "sample-128.png"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/fontSettings/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/fontSettings/manifest.json
new file mode 100644
index 00000000000..edb7559c809
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/fontSettings/manifest.json
@@ -0,0 +1,12 @@
+{
+  "name": "Advanced Font Settings",
+  "version": "0.66",
+  "manifest_version": 2,
+  "description": "Customize per-script font settings.",
+  "options_page": "options.html",
+  "icons": {
+    "16": "fonts16.png",
+    "128": "fonts128.png"
+  },
+  "permissions": ["fontSettings"]
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/history/showHistory/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/history/showHistory/manifest.json
new file mode 100644
index 00000000000..b4aa6ffe3bf
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/history/showHistory/manifest.json
@@ -0,0 +1,13 @@
+{
+  "name": "Typed URL History",
+  "version": "1.2",
+  "description": "Reads your history, and shows the top ten pages you go to by typing the URL.",
+  "permissions": [
+    "history"
+  ],
+  "browser_action": {
+    "default_popup": "typedUrls.html",
+    "default_icon": "clock.png"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/i18n/cld/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/i18n/cld/manifest.json
new file mode 100644
index 00000000000..4b242cf319f
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/i18n/cld/manifest.json
@@ -0,0 +1,12 @@
+{
+  "name": "CLD",
+  "description": "Displays the language of a tab",
+  "version": "0.3",
+  "background": {
+    "scripts": ["background.js"]
+  },
+  "browser_action": {
+      "default_name": "Page Language"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/i18n/getMessage/_locales/en_US/messages.json b/chromium/chrome/common/extensions/docs/examples/api/i18n/getMessage/_locales/en_US/messages.json
new file mode 100644
index 00000000000..b33d2f0a2c1
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/i18n/getMessage/_locales/en_US/messages.json
@@ -0,0 +1,27 @@
+{
+  "chrome_extension_name": {
+    "message": "AcceptLanguage"
+  },
+  "chrome_extension_description": {
+    "message": "Returns accept languages of the browser"
+  },
+  "click_here": {
+    "message": "Left click to list acceptLanguages."
+  },
+  "browser_action_title": {
+    "message": "Click Me"
+  },
+  "chrome_accept_languages": {
+    "message": "$CHROME$ accepts $languages$ languages",
+    "placeholders": {
+      "chrome": {
+        "content": "Chrome",
+        "example": "Chrome"
+      },
+      "languages": {
+        "content": "$1",
+        "example": "en-US,sr,de"
+      }
+    }
+  }
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/i18n/getMessage/_locales/es/messages.json b/chromium/chrome/common/extensions/docs/examples/api/i18n/getMessage/_locales/es/messages.json
new file mode 100644
index 00000000000..0e1a7ef43e0
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/i18n/getMessage/_locales/es/messages.json
@@ -0,0 +1,27 @@
+{
+  "chrome_extension_name": {
+    "message": "AcceptLanguage"
+  },
+  "chrome_extension_description": {
+    "message": "Devuelve los idiomas aceptados por el navegador"
+  },
+  "click_here": {
+    "message": "Click con botón izquierdo para mostrar la lista de acceptLanguages."
+  },
+  "browser_action_title": {
+    "message": "Haz click aquí"
+  },
+  "chrome_accept_languages": {
+    "message": "$CHROME$ acepta los idiomas $languages$",
+    "placeholders": {
+      "chrome": {
+        "content": "Chrome",
+        "example": "Chrome"
+      },
+      "languages": {
+        "content": "$1",
+        "example": "en-US,sr,de"
+      }
+    }
+  }
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/i18n/getMessage/_locales/sr/messages.json b/chromium/chrome/common/extensions/docs/examples/api/i18n/getMessage/_locales/sr/messages.json
new file mode 100644
index 00000000000..30bd958eedd
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/i18n/getMessage/_locales/sr/messages.json
@@ -0,0 +1,24 @@
+{
+  "chrome_extension_name": {
+    "message": "Прихватљиви језици"
+  },
+  "chrome_extension_description": {
+    "message": "Језици које прегледач прихвата"
+  },
+  "click_here": {
+    "message": "Кликните да излистате дозвољене језике."
+  },
+  "chrome_accept_languages": {
+    "message": "$CHROME$ прихвата $languages$ језике.",
+    "placeholders": {
+      "chrome": {
+        "content": "Chrome",
+        "example": "Chrome"
+      },
+      "languages": {
+        "content": "$1",
+        "example": "en-US,sr,de"
+      }
+    }
+  }
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/i18n/getMessage/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/i18n/getMessage/manifest.json
new file mode 100644
index 00000000000..52997f29891
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/i18n/getMessage/manifest.json
@@ -0,0 +1,12 @@
+{
+  "name": "__MSG_chrome_extension_name__",
+  "description": "__MSG_chrome_extension_description__",
+  "version": "0.2",
+  "default_locale": "en_US",
+  "browser_action": {
+      "default_title": "__MSG_browser_action_title__",
+      "default_icon": "icon.png",
+      "default_popup": "popup.html"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/i18n/localizedHostedApp/_locales/de/messages.json b/chromium/chrome/common/extensions/docs/examples/api/i18n/localizedHostedApp/_locales/de/messages.json
new file mode 100644
index 00000000000..0d8e2f7757c
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/i18n/localizedHostedApp/_locales/de/messages.json
@@ -0,0 +1,8 @@
+{
+  "application_title": {
+    "message": "Eine lokalisierte gehostete Beispielanwendung"
+  },
+  "application_description": {
+    "message": "Hier steht eine Beschreibung der Applikation, die im Web Store auftauchen wird."
+  }
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/i18n/localizedHostedApp/_locales/en/messages.json b/chromium/chrome/common/extensions/docs/examples/api/i18n/localizedHostedApp/_locales/en/messages.json
new file mode 100644
index 00000000000..ed87abfbf9c
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/i18n/localizedHostedApp/_locales/en/messages.json
@@ -0,0 +1,10 @@
+{
+  "application_title": {
+    "message": "Minimal Localized Hosted App",
+    "description": "The title of the application, displayed in the web store."
+  },
+  "application_description": {
+    "message": "This is the minimal set of data required to upload a localized hosted application to the web store.",
+    "description": "The description of the application, displayed in the web store."
+  }
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/i18n/localizedHostedApp/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/i18n/localizedHostedApp/manifest.json
new file mode 100644
index 00000000000..9cb94fd72db
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/i18n/localizedHostedApp/manifest.json
@@ -0,0 +1,15 @@
+{
+  "name": "__MSG_application_title__",
+  "description": "__MSG_application_description__",
+  "version": "0.2",
+  "default_locale": "en",
+  "app": {
+    "launch": {
+      "web_url": "http://example.com/"
+    }
+  },
+  "icons": {
+    "128": "icon128.png"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/idle/idle_simple/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/idle/idle_simple/manifest.json
new file mode 100644
index 00000000000..b6fba2a4d6b
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/idle/idle_simple/manifest.json
@@ -0,0 +1,18 @@
+{
+  "name" : "Idle - Simple Example",
+  "version" : "1.0.1",
+  "description" : "Demonstrates the Idle API",
+  "background" : {
+    "scripts": ["background.js"]
+  },
+  "permissions" : [ "idle" ],
+  "browser_action" : {
+    "default_icon" : "sample-19.png"
+  },
+  "icons" : {
+    "16" : "sample-16.png",
+    "48" : "sample-48.png",
+    "128" : "sample-128.png"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/infobars/sandwichbar/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/infobars/sandwichbar/manifest.json
new file mode 100644
index 00000000000..f14c8ad5006
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/infobars/sandwichbar/manifest.json
@@ -0,0 +1,23 @@
+{
+  "name" : "SandwichBar",
+  "version" : "1.0.1",
+  "description" : "Shows an infobar on pages which contain the word 'sandwich'",
+  "background" : {
+    "scripts": ["background.js"]
+  },
+  "permissions" : [ "infobars" ],
+  "icons" : {
+    "16" : "sandwich-16.png",
+    "48" : "sandwich-48.png",
+    "128" : "sandwich-128.png"
+  },
+  "content_scripts" : [
+    {
+      "matches" : [ "http://*/*" ],
+      "js" : [ "contentscript.js" ],
+      "run_at" : "document_idle",
+      "all_frames" : false
+    }
+  ],
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/input.ime/basic/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/input.ime/basic/manifest.json
new file mode 100644
index 00000000000..e21aec11562
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/input.ime/basic/manifest.json
@@ -0,0 +1,22 @@
+{
+  "name": "Test IME",
+  "version": "1.0",
+  "manifest_version": 2,
+  "description": "A simple IME that converts all keystrokes to upper case.",
+  "background":  {
+    "scripts": ["main.js"]
+  },
+  "permissions": [
+    "input"
+  ],
+  "input_components": [
+    {
+      "name": "Test IME",
+      "type": "ime",
+      "id": "test",
+      "description": "Test IME",  // A user visible description
+      "language": "en-US",  // The primary language this IME is used for
+      "layouts": ["us::eng"]  // The supported keyboard layouts for this IME
+    }
+  ]
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/messaging/timer/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/messaging/timer/manifest.json
new file mode 100644
index 00000000000..120eb147a19
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/messaging/timer/manifest.json
@@ -0,0 +1,17 @@
+{
+  "name": "Message Timer",
+  "version": "1.3",
+  "description": "Times how long it takes to send a message to a content script and back.",
+  "content_scripts": [
+    {
+      "matches": ["http://*/*"],
+      "js": ["page.js"]
+    }
+  ],
+  "browser_action": {
+    "default_title": "Time to current page",
+    "default_icon": "clock.png",
+    "default_popup": "popup.html"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/nativeMessaging/app/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/nativeMessaging/app/manifest.json
new file mode 100644
index 00000000000..a339e11dade
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/nativeMessaging/app/manifest.json
@@ -0,0 +1,19 @@
+{
+  // Extension ID: knldjmfmopnpolahpmmgbagdohdnhkik
+  "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDcBHwzDvyBQ6bDppkIs9MP4ksKqCMyXQ/A52JivHZKh4YO/9vJsT3oaYhSpDCE9RPocOEQvwsHsFReW2nUEc6OLLyoCFFxIb7KkLGsmfakkut/fFdNJYh0xOTbSN8YvLWcqph09XAY2Y/f0AL7vfO1cuCqtkMt8hFrBGWxDdf9CQIDAQAB",
+  "name": "Native Messaging Example",
+  "version": "1.0",
+  "manifest_version": 2,
+  "description": "Send a message to a native application.",
+  "app": {
+    "launch": {
+      "local_path": "main.html"
+    }
+  },
+  "icons": {
+    "128": "icon-128.png"
+  },
+  "permissions": [
+    "nativeMessaging"
+  ]
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/nativeMessaging/host/com.google.chrome.example.echo-win.json b/chromium/chrome/common/extensions/docs/examples/api/nativeMessaging/host/com.google.chrome.example.echo-win.json
new file mode 100644
index 00000000000..84e544847dd
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/nativeMessaging/host/com.google.chrome.example.echo-win.json
@@ -0,0 +1,13 @@
+// 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.
+
+{
+  "name": "com.google.chrome.example.echo",
+  "description": "Chrome Native Messaging API Example Host",
+  "path": "native-messaging-example-host.bat",
+  "type": "stdio",
+  "allowed_origins": [
+    "chrome-extension://knldjmfmopnpolahpmmgbagdohdnhkik/"
+  ]
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/nativeMessaging/host/com.google.chrome.example.echo.json b/chromium/chrome/common/extensions/docs/examples/api/nativeMessaging/host/com.google.chrome.example.echo.json
new file mode 100644
index 00000000000..dfeae04f627
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/nativeMessaging/host/com.google.chrome.example.echo.json
@@ -0,0 +1,13 @@
+// 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.
+
+{
+  "name": "com.google.chrome.example.echo",
+  "description": "Chrome Native Messaging API Example Host",
+  "path": "HOST_PATH",
+  "type": "stdio",
+  "allowed_origins": [
+    "chrome-extension://knldjmfmopnpolahpmmgbagdohdnhkik/"
+  ]
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/notifications/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/notifications/manifest.json
new file mode 100644
index 00000000000..1f77d635210
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/notifications/manifest.json
@@ -0,0 +1,18 @@
+{
+  "name": "Notification Demo",
+  "version": "1.1",
+  "description":
+    "Shows off desktop notifications, which are \"toast\" windows that pop up on the desktop.",
+  "icons": {"16": "16.png", "48": "48.png", "128": "128.png"},
+  "permissions": [
+    "notifications"
+  ],
+  "options_page": "options.html",
+  "background": { "scripts": ["background.js"] },
+  "manifest_version": 2,
+
+  // crbug.com/134315
+  "web_accessible_resources": [
+    "48.png"
+  ]
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/omnibox/simple-example/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/omnibox/simple-example/manifest.json
new file mode 100644
index 00000000000..dfdc4cae6ad
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/omnibox/simple-example/manifest.json
@@ -0,0 +1,10 @@
+{
+  "name": "Omnibox Example",
+  "description" : "To use, type 'omnix' plus a search term into the Omnibox.",
+  "version": "1.1",
+  "background": {
+    "scripts": ["background.js"]
+  },
+  "omnibox": { "keyword" : "omnix" },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/override/blank_ntp/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/override/blank_ntp/manifest.json
new file mode 100644
index 00000000000..9efcc231540
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/override/blank_ntp/manifest.json
@@ -0,0 +1,10 @@
+{
+  "name": "Blank new tab page",
+  "description": "Override the new tab page with a blank one",
+  "version": "0.2",
+  "incognito": "split",
+  "chrome_url_overrides": {
+    "newtab": "blank.html"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/override/override_igoogle/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/override/override_igoogle/manifest.json
new file mode 100644
index 00000000000..927faa3c1d6
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/override/override_igoogle/manifest.json
@@ -0,0 +1,9 @@
+{
+  "name": "iGoogle new tab page",
+  "description": "Override the new tab page with iGoogle",
+  "version": "0.2",
+  "chrome_url_overrides": {
+    "newtab": "redirect.html"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/pageAction/pageaction_by_content/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/pageAction/pageaction_by_content/manifest.json
new file mode 100644
index 00000000000..2b09d279021
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/pageAction/pageaction_by_content/manifest.json
@@ -0,0 +1,29 @@
+{
+  "name" : "Page action by content",
+  "version" : "1.1",
+  "description" : "Shows a page action for HTML pages containing the word 'sandwich'",
+  "background" : {
+    "scripts": ["background.js"]
+  },
+  "page_action" :
+  {
+    "default_icon" : "sandwich-19.png",
+    "default_title" : "There's a 'sandwich' in this page!"
+  },
+  "content_scripts" : [
+    {
+      "matches" : [
+        "http://*/*",
+        "https://*/*"
+      ],
+      "js" : ["contentscript.js"],
+      "run_at" : "document_idle",
+      "all_frames" : false
+    }
+  ],
+  "icons" : {
+    "48" : "sandwich-48.png",
+    "128" : "sandwich-128.png"
+  },
+  "manifest_version": 2
+}
\ No newline at end of file
diff --git a/chromium/chrome/common/extensions/docs/examples/api/pageAction/pageaction_by_url/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/pageAction/pageaction_by_url/manifest.json
new file mode 100644
index 00000000000..631ed9e0795
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/pageAction/pageaction_by_url/manifest.json
@@ -0,0 +1,19 @@
+{
+  "name": "Page action by URL",
+  "version": "1.0",
+  "description": "Shows a page action for urls which have the letter 'g' in them.",
+  "background": { "scripts": ["background.js"] },
+  "page_action" :
+  {
+    "default_icon" : "icon-19.png",
+    "default_title" : "There's a 'G' in this URL!"
+  },
+  "permissions" : [
+    "tabs"
+  ],
+  "icons" : {
+    "48" : "icon-48.png",
+    "128" : "icon-128.png"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/pageAction/set_icon/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/pageAction/set_icon/manifest.json
new file mode 100644
index 00000000000..115b8d0124a
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/pageAction/set_icon/manifest.json
@@ -0,0 +1,12 @@
+{
+  "name": "Animated Page Action",
+  "description": "This extension adds an animated browser action to the toolbar.",
+  "version": "1.2",
+  "background": {
+    "page": "background.html"
+  },
+  "page_action": {
+    "default_title": "First icon"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/permissions/extension-questions/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/permissions/extension-questions/manifest.json
new file mode 100644
index 00000000000..2d8647edc30
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/permissions/extension-questions/manifest.json
@@ -0,0 +1,17 @@
+{
+  "name": "Top Chrome Extension Questions",
+  "version": "0.3",
+  "description": "Sample demonstration of the optional permissions API.",
+  "icons": {
+    "128": "images/icon.png",
+    "48": "images/icon.png",
+    "16": "images/icon.png"
+  },
+  "browser_action": {
+    "default_icon": "images/icon.png",
+    "default_popup": "popup.html"
+  },
+  "options_page": "options.html",
+  "optional_permissions": ["http://api.stackoverflow.com/"],
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/power/_locales/en/messages.json b/chromium/chrome/common/extensions/docs/examples/api/power/_locales/en/messages.json
new file mode 100644
index 00000000000..ef50944de10
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/power/_locales/en/messages.json
@@ -0,0 +1,22 @@
+{
+  "extensionName": {
+    "message": "Keep Awake",
+    "description": "Extension name."
+  },
+  "extensionDescription": {
+    "message": "Override system power-saving settings.",
+    "description": "Extension description."
+  },
+  "disabledTitle": {
+    "message": "Default power-saving settings",
+    "description": "Browser action title when disabled."
+  },
+  "displayTitle": {
+    "message": "Screen will be kept on",
+    "description": "Browser action title when preventing screen-off."
+  },
+  "systemTitle": {
+    "message": "System will stay awake",
+    "description": "Browser action title when preventing system sleep."
+  }
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/power/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/power/manifest.json
new file mode 100644
index 00000000000..14eb8f131bd
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/power/manifest.json
@@ -0,0 +1,30 @@
+{
+  "manifest_version": 2,
+
+  "name": "__MSG_extensionName__",
+  "description": "__MSG_extensionDescription__",
+  "version": "1.7",
+  "icons": {
+    "16": "images/icon-16.png",
+    "48": "images/icon-48.png",
+    "128": "images/icon-128.png"
+  },
+
+  "permissions": [
+    "power",
+    "storage"
+  ],
+  "browser_action": {
+    "default_title": "__MSG_disabledTitle__",
+    "default_icon": {
+      "19": "images/night-19.png",
+      "38": "images/night-38.png"
+    }
+  },
+  "background": {
+    "scripts": ["background.js"],
+    "persistent": false
+  },
+
+  "default_locale": "en"
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/preferences/allowThirdPartyCookies/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/preferences/allowThirdPartyCookies/manifest.json
new file mode 100644
index 00000000000..25114067490
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/preferences/allowThirdPartyCookies/manifest.json
@@ -0,0 +1,11 @@
+{
+  "name" : "Block/allow third-party cookies API example extension",
+  "version" : "0.1",
+  "description" : "Sample extension which demonstrates how to access a preference.",
+  "permissions": [ "privacy" ],
+  "browser_action": {
+     "default_icon": "advicedog.jpg",
+     "default_popup": "popup.html"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/preferences/enableReferrer/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/preferences/enableReferrer/manifest.json
new file mode 100644
index 00000000000..c72e8959829
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/preferences/enableReferrer/manifest.json
@@ -0,0 +1,11 @@
+{
+  "name" : "Block/allow referrer API example extension",
+  "version" : "0.1",
+  "description" : "Sample extension which demonstrates how to access a preference.",
+  "permissions": [ "privacy" ],
+  "browser_action": {
+     "default_icon": "advicedog.jpg",
+     "default_popup": "popup.html"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/processes/process_monitor/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/processes/process_monitor/manifest.json
new file mode 100644
index 00000000000..2c1836a6f4a
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/processes/process_monitor/manifest.json
@@ -0,0 +1,14 @@
+{
+  "name": "Process Monitor",
+  "version": "1.2",
+  "description": "Adds a browser action that monitors resource usage of all browser processes.",
+  "permissions": [
+    "processes"
+  ],
+  "browser_action": {
+      "default_title": "Process Monitor",
+      "default_icon": "icon.png",
+      "default_popup": "popup.html"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/processes/show_tabs/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/processes/show_tabs/manifest.json
new file mode 100644
index 00000000000..bdbdb1e2254
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/processes/show_tabs/manifest.json
@@ -0,0 +1,14 @@
+{
+  "name": "Show Tabs in Process",
+  "version": "1.0",
+  "description": "Adds a browser action showing which tabs share the current tab's process.",
+  "permissions": [
+    "processes", "tabs", "chrome://favicon/*"
+  ],
+  "browser_action": {
+      "default_title": "Show Tabs in this Process",
+      "default_icon": "icon.png",
+      "default_popup": "popup.html"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/storage/stylizr/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/storage/stylizr/manifest.json
new file mode 100644
index 00000000000..1c0b9cebf0d
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/storage/stylizr/manifest.json
@@ -0,0 +1,20 @@
+{
+  "name": "Stylizr",
+  "description": "Spruce up your pages with custom CSS.",
+  "version": "1.0",
+
+  "permissions": [
+    "activeTab",
+    "storage"
+  ],
+
+  "options_page": "options.html",
+
+  "browser_action": {
+    "default_icon": "icon.png",
+    "default_title": "Stylize!",
+    "default_popup": "popup.html"
+  },
+
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/tabs/inspector/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/tabs/inspector/manifest.json
new file mode 100644
index 00000000000..68b7728ec3f
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/tabs/inspector/manifest.json
@@ -0,0 +1,14 @@
+{
+  "name": "Tab Inspector",
+  "description": "Utility for working with the extension tabs api",
+  "version": "0.3",
+  "permissions": ["tabs"],
+  "background": {
+    "persistent": false,
+    "scripts": ["background.js"]
+  },
+  "browser_action": {
+    "default_title": "show tab inspector"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/tabs/pin/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/tabs/pin/manifest.json
new file mode 100644
index 00000000000..3154c8c9368
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/tabs/pin/manifest.json
@@ -0,0 +1,16 @@
+{
+  "name": "Keyboard Pin",
+  "version": "0.3",
+  "description": "Creates a keyboard shortcut (Alt + Shift + P) to toggle the pinned state of the currently selected tab",
+  "background": {
+    "persistent": false,
+    "scripts": ["background.js"]
+  },
+  "commands": {
+    "toggle-pin": {
+      "suggested_key": { "default": "Alt+Shift+P" },
+      "description": "Toggle tab pin"
+    }
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/tabs/screenshot/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/tabs/screenshot/manifest.json
new file mode 100644
index 00000000000..c9ddae38f53
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/tabs/screenshot/manifest.json
@@ -0,0 +1,17 @@
+{
+  "name": "Test Screenshot Extension",
+  "version": "1.2",
+  "description": "Demonstrate screenshot functionality in the chrome.tabs api. Note: only works for code.google.com",
+  "background": {
+    "persistent": false,
+    "scripts": ["background.js"]
+  },
+  "browser_action": {
+    "default_icon": "camera.png",
+    "default_title": "Take a screen shot!"
+  },
+  "permissions": [
+    "*://code.google.com/"
+  ],
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/topsites/basic/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/topsites/basic/manifest.json
new file mode 100644
index 00000000000..c042c095a4e
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/topsites/basic/manifest.json
@@ -0,0 +1,11 @@
+{
+  "name": "Top Sites",
+  "version": "1.2",
+  "description": "Shows the top sites in a browser action",
+  "permissions": ["topSites"],
+  "browser_action": {
+    "default_icon": "icon.png",
+    "default_popup": "popup.html"
+  },
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/topsites/magic8ball/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/topsites/magic8ball/manifest.json
new file mode 100644
index 00000000000..84f12ac5aae
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/topsites/magic8ball/manifest.json
@@ -0,0 +1,13 @@
+{
+  "name": "NTP prototyping extension",
+  "version": "1.1",
+  "description": "extension to prototype new NTP designs",
+  "chrome_url_overrides" : {
+    "newtab": "newTab.html"
+  },
+  "permissions": [
+    "topSites",
+    "chrome://favicon/"
+  ],
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/ttsEngine/console_tts_engine/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/ttsEngine/console_tts_engine/manifest.json
new file mode 100644
index 00000000000..35be832ec8f
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/ttsEngine/console_tts_engine/manifest.json
@@ -0,0 +1,19 @@
+{
+  "name": "Console TTS Engine",
+  "manifest_version": 2,
+  "version": "2.1",
+  "description": "A \"silent\" TTS engine that prints text to a small window rather than synthesizing speech.",
+  "permissions": ["ttsEngine", "tabs"],
+  "background": {
+    "persistent": false,
+    "scripts": ["console_tts_engine.js"]
+  },
+  "tts_engine": {
+    "voices": [
+      {
+        "voice_name": "Console",
+        "event_types": ["start", "word", "sentence", "end"]
+      }
+    ]
+  }
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/webNavigation/basic/_locales/en/messages.json b/chromium/chrome/common/extensions/docs/examples/api/webNavigation/basic/_locales/en/messages.json
new file mode 100644
index 00000000000..e639880d7c4
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/webNavigation/basic/_locales/en/messages.json
@@ -0,0 +1,52 @@
+{
+  "extName":  {
+    "message": "WebNavigation Tech Demo",
+    "description": "The extension name."
+  },
+  "extDescription": {
+    "message": "Demonstration of the WebNavigation extension API.",
+    "description": "The extension description."
+  },
+
+  "navigationDescription": {
+    "message": ", requested $NUM$ times.  Loaded in an average of $LOAD$ miliseconds.",
+    "description": "The message posted in the popup for each stored navigation.",
+    "placeholders": {
+      "NUM": {
+        "content": "$1",
+        "example": "4 (The number of times this URL was accessed.)"
+      },
+      "LOAD": {
+        "content": "$2",
+        "example": "12.345 (The average load time in miliseconds.)"
+      }
+    }
+  },
+
+  "inHandler": {
+    "message": "In webNavigation[`%s`] handler: %o",
+    "description": "Notification displayed for each webNavigation event."
+  },
+
+  "inHandlerError": {
+    "message": "In webNavigation[`%s`] handler: No data!",
+    "description": "Notification displayed in a webNavigation event handler without data!"
+  },
+
+  "errorCommittedWithoutPending": {
+    "message": "Wha?  `onCommitted` for `%s` called, though it's not pending: %o",
+    "description": "Error logged when `onCommitted` is triggered on a non-pending request."
+  },
+  "errorCompletedWithoutPending": {
+    "message": "Wha?  `onCompleted` for `%s` called, though it's not pending: %o",
+    "description": "Error logged when `onCompleted` is triggered on a non-pending request."
+  },
+  "errorErrorOccurredWithoutPending": {
+    "message": "Wha?  `onErrorOccurred` for `%s` called, though it's not pending: %o",
+    "description": "Error logged when `onErrorOccurred` is triggered on a non-pending request."
+  },
+  "errorCommittedWithoutPending": {
+    "message": "Wha?  `onCompleted` for `%s` called, though it's not pending: %o",
+    "description": "Error logged when `onCompleted` is triggered on a non-pending request."
+  }
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/webNavigation/basic/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/webNavigation/basic/manifest.json
new file mode 100644
index 00000000000..2c0d43519dc
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/webNavigation/basic/manifest.json
@@ -0,0 +1,18 @@
+{
+  "name":           "__MSG_extName__",
+  "version":        "0.2",
+  "description":    "__MSG_extDescription__",
+  "default_locale": "en",
+  "background": {
+    "persistent": false,
+    "scripts": ["navigation_collector.js", "background.js"]
+  },
+  "browser_action": {
+    "default_icon": "icon.png",
+    "default_popup": "popup.html"
+  },
+  "permissions":    [
+    "webNavigation", "storage"
+  ],
+  "manifest_version": 2
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/windows/merge_windows/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/windows/merge_windows/manifest.json
new file mode 100644
index 00000000000..b5b51737667
--- /dev/null
+++ b/chromium/chrome/common/extensions/docs/examples/api/windows/merge_windows/manifest.json
@@ -0,0 +1,18 @@
+{
+  "name": "Merge Windows",
+  "version": "1.0.2",
+  "description": "Merges all of the browser's windows into the current window",
+  "icons": {
+    "48": "merge_windows_48.png",
+    "128": "merge_windows_128.png"
+  },
+  "background": {
+    "persistent": false,
+    "scripts": ["background.js"]
+  },
+  "browser_action": {
+    "default_icon": "arrow_in.png",
+    "default_title": "Merge Windows"
+  },
+  "manifest_version": 2
+}