Add support for omnibox.onInputStarted and onInputCancelled.

chrome/browser/search_engines/template_url_model.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/search_engines/template_url_model.h"
 
 #include "app/l10n_util.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extensions_service.h"
@@ skipping 1050 matching lines @@
   // TODO(mpcomplete): disable the keyword when the extension is disabled.
   if (extension->omnibox_keyword().empty())
     return;
 
   Load();
   if (!loaded_) {
     pending_extension_ids_.push_back(extension->id());
     return;
   }
 
-  if (GetTemplateURLForExtension(extension))
-    return;  // Already have this one registered (might be an upgrade).
-
+  const TemplateURL* existing_url = GetTemplateURLForExtension(extension);
   std::wstring keyword = UTF8ToWide(extension->omnibox_keyword());
 
   TemplateURL* template_url = new TemplateURL;
   template_url->set_short_name(UTF8ToWide(extension->name()));
   template_url->set_keyword(keyword);
   // This URL is not actually used for navigation. It holds the extension's
   // ID, as well as forcing the TemplateURL to be treated as a search keyword.
   template_url->SetURL(
       std::string(chrome::kExtensionScheme) + "://" +
       extension->id() + "/?q={searchTerms}", 0, 0);
   template_url->set_safe_for_autoreplace(false);
 
-  Add(template_url);
+  if (existing_url) {
+    // TODO(mpcomplete): only replace if the user hasn't changed the keyword.
+    // (We don't have UI for that yet).
+    Replace(existing_url, template_url);
+  } else {
+    Add(template_url);
+  }
 }
 
 void TemplateURLModel::UnregisterExtensionKeyword(Extension* extension) {
   const TemplateURL* url = GetTemplateURLForExtension(extension);
   if (url)
     Remove(url);
 }
 
 const TemplateURL* TemplateURLModel::GetTemplateURLForExtension(
     Extension* extension) const {
   for (TemplateURLVector::const_iterator i = template_urls_.begin();
        i != template_urls_.end(); ++i) {
     if ((*i)->IsExtensionKeyword() && (*i)->url()->GetHost() == extension->id())
       return *i;
   }
 
   return NULL;
 }