Change detectLanguage() API to now return the top three languages as well their percentages. Added suitable unit testing to test that top three languages are returned as expected.

BUG=20666
TEST=none
Review URL: http://codereview.chromium.org/223010

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

2 files changed, 31 insertions, 7 deletions

diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json
index 4ad7e46..45f1055 100755
--- a/chrome/common/extensions/api/extension_api.json
+++ b/chrome/common/extensions/api/extension_api.json
@@ -551,9 +551,23 @@
             "name": "callback",
             "parameters": [
               {
-                "type": "string",
-                "name": "language",
-                "description": "An ISO language code like <var>en</var> or <var>fr</var>. For the complete list of languages supported by this method, see 2nd column of kLanguageInfoTable in http://src.chromium.org/viewvc/chrome/trunk/src/third_party/cld/bar/toolbar/cld/i18n/languages/internal/languages.cc"
+                "type": "array",
+                "name": "topLanguages",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "languageName": {
+                      "type": "string",
+                      "description": "An ISO language code like <var>en</var> or <var>fr</var>. For the complete list of languages supported by this method, see 2nd column of kLanguageInfoTable in http://src.chromium.org/viewvc/chrome/trunk/src/third_party/cld/bar/toolbar/cld/i18n/languages/internal/languages.cc"
+                 },
+                    "percentUsed": {
+                      "type": "number",
+                      "description": "The percentage of the page that uses this language",
+                      "minimum": 0, "maximum": 100
+                    }
+                  }
+                },
+                "description": "The top three languages used in the document, in decreasing order of usage."
               }
             ]
           }
diff --git a/chrome/common/extensions/docs/tabs.html b/chrome/common/extensions/docs/tabs.html
index c886b4c..9afab2f 100755
--- a/chrome/common/extensions/docs/tabs.html
+++ b/chrome/common/extensions/docs/tabs.html
@@ -1126,12 +1126,12 @@ For example:
                   </p>
 
                   <!-- Note: intentionally longer 80 columns -->
-                  <pre>function(<span>string language</span>) <span class="subdued">{...}</span>);</pre>
+                  <pre>function(<span>array of object topLanguages</span>) <span class="subdued">{...}</span>);</pre>
                   <dl>
                     <div jsinstance="*0">
                       <div>
           <dt>
-            <var>language</var>
+            <var>topLanguages</var>
               <em>
 
                 <!-- TYPE -->
@@ -1143,10 +1143,20 @@ For example:
                         <a> Type</a>
                       </span>
                       <span>
+                        <span>
+                          array of <span><span>
+                      <span style="display: none; ">
+                        <a> Type</a>
+                      </span>
+                      <span>
                         <span style="display: none; ">
                           array of <span><span></span></span>
                         </span>
-                        <span>string</span>
+                        <span>object</span>
+                      </span>
+                    </span></span>
+                        </span>
+                        <span style="display: none; ">paramType</span>
                       </span>
                     </span>
                   )
@@ -1157,7 +1167,7 @@ For example:
           <dd class="todo" style="display: none; ">
             Undocumented.
           </dd>
-          <dd>An ISO language code like <var>en</var> or <var>fr</var>. For the complete list of languages supported by this method, see 2nd column of kLanguageInfoTable in http://src.chromium.org/viewvc/chrome/trunk/src/third_party/cld/bar/toolbar/cld/i18n/languages/internal/languages.cc</dd>
+          <dd>The top three languages used in the document, in decreasing order of usage.</dd>
 
           <!-- OBJECT PROPERTIES -->
           <dd style="display: none; ">