Add support for omnibox.onInputStarted and onInputCancelled.

Also fix a bug where we'd keep an extension's old keyword even if it changed
on upgrade/reload.

BUG=46475
BUG=48091

Review URL: http://codereview.chromium.org/2807033

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

2 files changed, 70 insertions, 0 deletions

diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json
index ca7ed2a..9fe34cf 100644
--- a/chrome/common/extensions/api/extension_api.json
+++ b/chrome/common/extensions/api/extension_api.json
@@ -1346,6 +1346,7 @@
     "events": [
       {
         "name": "onClicked",
+        "perExtensionEvent": true,
         "type": "function",
         "description": "Fired when a page action icon is clicked.  This event will not fire if the page action has a popup.",
         "parameters": [
@@ -1493,6 +1494,7 @@
     "events": [
       {
         "name": "onClicked",
+        "perExtensionEvent": true,
         "type": "function",
         "description": "Fired when a browser action icon is clicked.  This event will not fire if the browser action has a popup.",
         "parameters": [
@@ -3132,7 +3134,15 @@
     ],
     "events": [
       {
+        "name": "onInputStarted",
+        "perExtensionEvent": true,
+        "type": "function",
+        "description": "User has started a keyword input session by typing the extension's keyword. This is guaranteed to be sent exactly once per input session, and before any onInputChanged events.",
+        "parameters": []
+      },
+      {
         "name": "onInputChanged",
+        "perExtensionEvent": true,
         "type": "function",
         "description": "User has changed what is typed into the omnibox.",
         "parameters": [
@@ -3159,6 +3169,7 @@
       },
       {
         "name": "onInputEntered",
+        "perExtensionEvent": true,
         "type": "function",
         "description": "User has accepted what is typed into the omnibox.",
         "parameters": [
@@ -3167,6 +3178,13 @@
             "name": "text"
           }
         ]
+      },
+      {
+        "name": "onInputCancelled",
+        "perExtensionEvent": true,
+        "type": "function",
+        "description": "User has ended the keyword input session without accepting the input.",
+        "parameters": []
       }
     ]
   }
diff --git a/chrome/common/extensions/docs/experimental.omnibox.html b/chrome/common/extensions/docs/experimental.omnibox.html
index a0fc7cc..415c38c 100644
--- a/chrome/common/extensions/docs/experimental.omnibox.html
+++ b/chrome/common/extensions/docs/experimental.omnibox.html
@@ -250,9 +250,13 @@
                     <a href="#events">Events</a>
                     <ol>
                       <li>
+                        <a href="#event-onInputCancelled">onInputCancelled</a>
+                      </li><li>
                         <a href="#event-onInputChanged">onInputChanged</a>
                       </li><li>
                         <a href="#event-onInputEntered">onInputEntered</a>
+                      </li><li>
+                        <a href="#event-onInputStarted">onInputStarted</a>
                       </li>
                     </ol>
                   </li>
@@ -731,6 +735,30 @@ see the <a href="experimental.html">chrome.experimental.* APIs</a> page.
 
             <!-- iterates over all events -->
             <div class="apiItem">
+              <a name="event-onInputCancelled"></a>
+              <h4>onInputCancelled</h4>
+
+              <div class="summary">
+                <!-- Note: intentionally longer 80 columns -->
+                <span class="subdued">chrome.experimental.omnibox.</span><span>onInputCancelled</span><span class="subdued">.addListener</span>(function(<span></span>) <span class="subdued">{...}</span>);
+              </div>
+
+              <div class="description">
+                <p class="todo" style="display: none; ">Undocumented.</p>
+                <p>User has ended the keyword input session without accepting the input.</p>
+
+                <!-- PARAMETERS -->
+                <h4>Parameters</h4>
+                <dl>
+                  <div style="display: none; ">
+                    <div>
+                    </div>
+                  </div>
+                </dl>
+
+              </div> <!-- /decription -->
+
+            </div><div class="apiItem">
               <a name="event-onInputChanged"></a>
               <h4>onInputChanged</h4>
 
@@ -932,6 +960,30 @@ see the <a href="experimental.html">chrome.experimental.* APIs</a> page.
 
               </div> <!-- /decription -->
 
+            </div><div class="apiItem">
+              <a name="event-onInputStarted"></a>
+              <h4>onInputStarted</h4>
+
+              <div class="summary">
+                <!-- Note: intentionally longer 80 columns -->
+                <span class="subdued">chrome.experimental.omnibox.</span><span>onInputStarted</span><span class="subdued">.addListener</span>(function(<span></span>) <span class="subdued">{...}</span>);
+              </div>
+
+              <div class="description">
+                <p class="todo" style="display: none; ">Undocumented.</p>
+                <p>User has started a keyword input session by typing the extension's keyword. This is guaranteed to be sent exactly once per input session, and before any onInputChanged events.</p>
+
+                <!-- PARAMETERS -->
+                <h4>Parameters</h4>
+                <dl>
+                  <div style="display: none; ">
+                    <div>
+                    </div>
+                  </div>
+                </dl>
+
+              </div> <!-- /decription -->
+
             </div> <!-- /apiItem -->
 
           </div> <!-- /apiGroup -->