Use manifest version 2 for font settings sample extension.

BUG=
TBR=mpcomplete

Review URL: https://chromiumcodereview.appspot.com/10825094

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149138 0039d316-1c4b-4281-b951-d872f2087c98

chrome/common/extensions/docs/apps/manifest.html

@@ -952,9 +952,10 @@ direct access to non-sandboxed pages (it may communicate with them via
 <code>postMessage()</code>).</li>
 <li>
   <p>A sandboxed page is not subject to the
-  <a href="../extensions/contentSecurityPolicy.html">Content Security Policy (CSP)</a> used
-  by the rest of the app or extension (it has its own separate CSP value). This
-  means that, for example, it can use inline script and <code>eval</code>.</p>
+  <a href="../extensions/contentSecurityPolicy.html">Content Security Policy
+  (CSP)</a> used by the rest of the app or extension (it has its own separate
+  CSP value). This means that, for example, it can use inline script and
+  <code>eval</code>.</p>
   <p>For example, here's how to specify that two extension pages are to be
   served in a sandbox with a custom CSP:</p>
   <pre>{
@@ -991,7 +992,8 @@ that embeds them.
 <a href="sandboxingEval.html">"Using eval in Chrome Extensions. Safely."</a>
 goes into more detail about implementing a sandboxing workflow that enables use
 of libraries that would otherwise have issues executing under extension's
-<a href="../extensions/contentSecurityPolicy.html">default Content Security Policy</a>.
+<a href="../extensions/contentSecurityPolicy.html">default Content Security
+Policy</a>.
 </p>
 <p>
 Sandboxed page may only be specified when using

chrome/common/extensions/docs/examples/api/fontSettings/manifest.json

 {
   "name": "Font Settings",
   "version": "0.2",
+  "manifest_version": 2,
   "description": "Sample extension for Font Settings API",
   "browser_action" : {
     "default_icon": "fonts16.png",
-    "popup": "popup.html"
+    "default_popup": "popup.html"
   },
   "icons": {
     "16": "fonts16.png",

chrome/common/extensions/docs/extensions/manifest.html

@@ -981,9 +981,10 @@ direct access to non-sandboxed pages (it may communicate with them via
 <code>postMessage()</code>).</li>
 <li>
   <p>A sandboxed page is not subject to the
-  <a href="../extensions/contentSecurityPolicy.html">Content Security Policy (CSP)</a> used
-  by the rest of the app or extension (it has its own separate CSP value). This
-  means that, for example, it can use inline script and <code>eval</code>.</p>
+  <a href="../extensions/contentSecurityPolicy.html">Content Security Policy
+  (CSP)</a> used by the rest of the app or extension (it has its own separate
+  CSP value). This means that, for example, it can use inline script and
+  <code>eval</code>.</p>
   <p>For example, here's how to specify that two extension pages are to be
   served in a sandbox with a custom CSP:</p>
   <pre>{
@@ -1020,7 +1021,8 @@ that embeds them.
 <a href="sandboxingEval.html">"Using eval in Chrome Extensions. Safely."</a>
 goes into more detail about implementing a sandboxing workflow that enables use
 of libraries that would otherwise have issues executing under extension's
-<a href="../extensions/contentSecurityPolicy.html">default Content Security Policy</a>.
+<a href="../extensions/contentSecurityPolicy.html">default Content Security
+Policy</a>.
 </p>
 <p>
 Sandboxed page may only be specified when using

chrome/common/extensions/docs/extensions/samples.html

@@ -222,7 +222,7 @@
   "26115f23aef245d6757587e3e517bbe4b3bc55fe": "EVENT PAGE EXAMPLE DEMONSTRATES USAGE AND FEATURES OF THE EVENT PAGE ALARMS BACKGROUND_PAGE BOOKMARKS BROWSER_ACTION EXPERIMENTAL KEYBINDING TABS CHROME.ALARMS.CREATE CHROME.ALARMS.ONALARM CHROME.BOOKMARKS.ONREMOVED CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETBADGETEXT CHROME.DECLARATIVEWEBREQUEST.ONREQUEST CHROME.EXPERIMENTAL.KEYBINDING.ONCOMMAND CHROME.EXTENSION.ONMESSAGE CHROME.EXTENSION.SENDMESSAGE CHROME.RUNTIME.ONINSTALLED CHROME.RUNTIME.ONSUSPEND CHROME.TABS.CREATE CHROME.TABS.EXECUTESCRIPT CHROME.TABS.QUERY CHROME.TABS.SENDMESSAGE",
   "763a08e9b06595d785568a8d392b95a2f3700258": "EVENT TRACKING WITH GOOGLE ANALYTICS A SAMPLE EXTENSION WHICH USES GOOGLE ANALYTICS TO TRACK USAGE. BROWSER_ACTION",
   "4efa12eaaa442b6b7c880e7a38ceeb0cff7e8b77": "FIREPHP FOR CHROME EXTENDS THE DEVELOPER TOOLS, ADDING SUPPORT FOR PARSING FIREPHP MESSAGES FROM SERVER BACKGROUND_PAGE DEVTOOLS_PAGE TABS CHROME.DEVTOOLS.NETWORK.GETHAR CHROME.DEVTOOLS.NETWORK.ONREQUESTFINISHED CHROME.TABS.EXECUTESCRIPT",
-  "31d10fd5e61ca51eb59073b358d4ab5267cbf318": "FONT SETTINGS SAMPLE EXTENSION FOR FONT SETTINGS API BROWSER_ACTION FONTSETTINGS POPUP CHROME.FONTSETTINGS.CLEARDEFAULTFIXEDFONTSIZE CHROME.FONTSETTINGS.CLEARDEFAULTFONTSIZE CHROME.FONTSETTINGS.CLEARFONT CHROME.FONTSETTINGS.CLEARMINIMUMFONTSIZE CHROME.FONTSETTINGS.GETDEFAULTFIXEDFONTSIZE CHROME.FONTSETTINGS.GETDEFAULTFONTSIZE CHROME.FONTSETTINGS.GETFONT CHROME.FONTSETTINGS.GETFONTLIST CHROME.FONTSETTINGS.GETMINIMUMFONTSIZE CHROME.FONTSETTINGS.ONDEFAULTFIXEDFONTSIZECHANGED CHROME.FONTSETTINGS.ONDEFAULTFONTSIZECHANGED CHROME.FONTSETTINGS.ONFONTCHANGED CHROME.FONTSETTINGS.ONMINIMUMFONTSIZECHANGED CHROME.FONTSETTINGS.SETDEFAULTFIXEDFONTSIZE CHROME.FONTSETTINGS.SETDEFAULTFONTSIZE CHROME.FONTSETTINGS.SETFONT CHROME.FONTSETTINGS.SETMINIMUMFONTSIZE",
+  "31d10fd5e61ca51eb59073b358d4ab5267cbf318": "FONT SETTINGS SAMPLE EXTENSION FOR FONT SETTINGS API BROWSER_ACTION FONTSETTINGS CHROME.FONTSETTINGS.CLEARDEFAULTFIXEDFONTSIZE CHROME.FONTSETTINGS.CLEARDEFAULTFONTSIZE CHROME.FONTSETTINGS.CLEARFONT CHROME.FONTSETTINGS.CLEARMINIMUMFONTSIZE CHROME.FONTSETTINGS.GETDEFAULTFIXEDFONTSIZE CHROME.FONTSETTINGS.GETDEFAULTFONTSIZE CHROME.FONTSETTINGS.GETFONT CHROME.FONTSETTINGS.GETFONTLIST CHROME.FONTSETTINGS.GETMINIMUMFONTSIZE CHROME.FONTSETTINGS.ONDEFAULTFIXEDFONTSIZECHANGED CHROME.FONTSETTINGS.ONDEFAULTFONTSIZECHANGED CHROME.FONTSETTINGS.ONFONTCHANGED CHROME.FONTSETTINGS.ONMINIMUMFONTSIZECHANGED CHROME.FONTSETTINGS.SETDEFAULTFIXEDFONTSIZE CHROME.FONTSETTINGS.SETDEFAULTFONTSIZE CHROME.FONTSETTINGS.SETFONT CHROME.FONTSETTINGS.SETMINIMUMFONTSIZE",
   "8b0dd31216235941bdd8eb33fda915ef5cf79a82": "GOOGLE CALENDAR CHECKER (BY GOOGLE) QUICKLY SEE THE TIME UNTIL YOUR NEXT MEETING FROM ANY OF YOUR CALENDARS. CLICK ON THE BUTTON TO BE TAKEN TO YOUR CALENDAR. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE TABS CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETICON CHROME.BROWSERACTION.SETTITLE CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.I18N.GETMESSAGE CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.ONUPDATED CHROME.TABS.UPDATE",
   "4e35caa9742fb82dbd628892d23a781614f6eff6": "GOOGLE DOCUMENT LIST VIEWER DEMONSTRATES HOW TO USE OAUTH TO CONNECT THE GOOGLE DOCUMENTS LIST DATA API. BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE TABS CHROME.BROWSERACTION.SETBADGETEXT CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.EXTENSION.GETURL CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.ONUPDATED CHROME.TABS.REMOVE",
   "bb57f7a0132cbeb36ad7e7bb0ab75c21704234ca": "GOOGLE MAIL CHECKER DISPLAYS THE NUMBER OF UNREAD MESSAGES IN YOUR GOOGLE MAIL INBOX. YOU CAN ALSO CLICK THE BUTTON TO OPEN YOUR INBOX. ALARMS BACKGROUND_PAGE BROWSER_ACTION OPTIONS_PAGE TABS CHROME.ALARMS.CREATE CHROME.ALARMS.ONALARM CHROME.BROWSERACTION.ONCLICKED CHROME.BROWSERACTION.SETBADGEBACKGROUNDCOLOR CHROME.BROWSERACTION.SETBADGETEXT CHROME.BROWSERACTION.SETICON CHROME.EXTENSION.GETBACKGROUNDPAGE CHROME.I18N.GETMESSAGE CHROME.TABS.CREATE CHROME.TABS.GET CHROME.TABS.ONUPDATED CHROME.TABS.UPDATE",
@@ -1567,12 +1567,10 @@
   </h2>
   <p class="metadata features">Uses
     <span>
-      <strong>browser_action</strong><span>, </span>
-    </span><span>
-      <strong>fontSettings</strong>
+      <strong>browser_action</strong>
       <span> and</span>
     </span><span>
-      <strong>popup</strong>
+      <strong>fontSettings</strong>
     </span>
   </p>
   <p>Sample extension for Font Settings API</p>

chrome/common/extensions/docs/samples.json

@@ -1251,8 +1251,7 @@
       "description": "Sample extension for Font Settings API",
       "features": [
         "browser_action",
-        "fontSettings",
-        "popup"
+        "fontSettings"
       ],
       "icon": "fonts128.png",
       "id": "31d10fd5e61ca51eb59073b358d4ab5267cbf318",
@@ -1260,13 +1259,13 @@
       "packaged_app": false,
       "path": "examples/api/fontSettings/",
       "protocols": [],
-      "search_string": "FONT SETTINGS SAMPLE EXTENSION FOR FONT SETTINGS API BROWSER_ACTION FONTSETTINGS POPUP CHROME.FONTSETTINGS.CLEARDEFAULTFIXEDFONTSIZE CHROME.FONTSETTINGS.CLEARDEFAULTFONTSIZE CHROME.FONTSETTINGS.CLEARFONT CHROME.FONTSETTINGS.CLEARMINIMUMFONTSIZE CHROME.FONTSETTINGS.GETDEFAULTFIXEDFONTSIZE CHROME.FONTSETTINGS.GETDEFAULTFONTSIZE CHROME.FONTSETTINGS.GETFONT CHROME.FONTSETTINGS.GETFONTLIST CHROME.FONTSETTINGS.GETMINIMUMFONTSIZE CHROME.FONTSETTINGS.ONDEFAULTFIXEDFONTSIZECHANGED CHROME.FONTSETTINGS.ONDEFAULTFONTSIZECHANGED CHROME.FONTSETTINGS.ONFONTCHANGED CHROME.FONTSETTINGS.ONMINIMUMFONTSIZECHANGED CHROME.FONTSETTINGS.SETDEFAULTFIXEDFONTSIZE CHROME.FONTSETTINGS.SETDEFAULTFONTSIZE CHROME.FONTSETTINGS.SETFONT CHROME.FONTSETTINGS.SETMINIMUMFONTSIZE",
+      "search_string": "FONT SETTINGS SAMPLE EXTENSION FOR FONT SETTINGS API BROWSER_ACTION FONTSETTINGS CHROME.FONTSETTINGS.CLEARDEFAULTFIXEDFONTSIZE CHROME.FONTSETTINGS.CLEARDEFAULTFONTSIZE CHROME.FONTSETTINGS.CLEARFONT CHROME.FONTSETTINGS.CLEARMINIMUMFONTSIZE CHROME.FONTSETTINGS.GETDEFAULTFIXEDFONTSIZE CHROME.FONTSETTINGS.GETDEFAULTFONTSIZE CHROME.FONTSETTINGS.GETFONT CHROME.FONTSETTINGS.GETFONTLIST CHROME.FONTSETTINGS.GETMINIMUMFONTSIZE CHROME.FONTSETTINGS.ONDEFAULTFIXEDFONTSIZECHANGED CHROME.FONTSETTINGS.ONDEFAULTFONTSIZECHANGED CHROME.FONTSETTINGS.ONFONTCHANGED CHROME.FONTSETTINGS.ONMINIMUMFONTSIZECHANGED CHROME.FONTSETTINGS.SETDEFAULTFIXEDFONTSIZE CHROME.FONTSETTINGS.SETDEFAULTFONTSIZE CHROME.FONTSETTINGS.SETFONT CHROME.FONTSETTINGS.SETMINIMUMFONTSIZE",
       "source_files": [
         "manifest.json",
         "popup.html",
         "popup.js"
       ],
-      "source_hash": "02a9aac2ea6ab8095d0b53a1b8433fcc354133f6",
+      "source_hash": "d46eaac64f67efa4d433b8589605effb50b99795",
       "zip_path": "examples/api/fontSettings.zip"
     },
     {