SupportsUserData and manifest handlers for Extension; use them for the Omnibox API.

chrome/browser/ui/webui/options/search_engine_manager_handler.cc

 // Copyright (c) 2012 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/ui/webui/options/search_engine_manager_handler.h"
 
 #include "base/bind.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/ui/search_engines/template_url_table_model.h"
+#include "chrome/common/extensions/api/omnibox/omnibox_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 enum EngineInfoIndexes {
@@ skipping 110 matching lines @@
   }
 
   // Build the extension keywords list.
   ListValue keyword_list;
   ExtensionService* extension_service =
       Profile::FromWebUI(web_ui())->GetExtensionService();
   if (extension_service) {
     const ExtensionSet* extensions = extension_service->extensions();
     for (ExtensionSet::const_iterator it = extensions->begin();
          it != extensions->end(); ++it) {
-      if ((*it)->omnibox_keyword().size() > 0)
+      if (extensions::OmniboxInfo::GetKeyword(*it).size() > 0)
         keyword_list.Append(CreateDictionaryForExtension(*(*it)));
     }
   }
 
   web_ui()->CallJavascriptFunction("SearchEngineManager.updateSearchEngineList",
                                    defaults_list, others_list, keyword_list);
 }
 
 void SearchEngineManagerHandler::OnItemsChanged(int start, int length) {
   OnModelChanged();
 }
 
 void SearchEngineManagerHandler::OnItemsAdded(int start, int length) {
   OnModelChanged();
 }
 
 void SearchEngineManagerHandler::OnItemsRemoved(int start, int length) {
   OnModelChanged();
 }
 
 base::DictionaryValue* SearchEngineManagerHandler::CreateDictionaryForExtension(
     const extensions::Extension& extension) {
   base::DictionaryValue* dict = new base::DictionaryValue();
   dict->SetString("name",  extension.name());
   dict->SetString("displayName", extension.name());
-  dict->SetString("keyword", extension.omnibox_keyword());
+  dict->SetString("keyword",
+                  extensions::OmniboxInfo::GetKeyword(&extension));
   GURL icon = extension.GetIconURL(16, ExtensionIconSet::MATCH_BIGGER);
   dict->SetString("iconURL", icon.spec());
   dict->SetString("url", string16());
   return dict;
 }
 
 base::DictionaryValue* SearchEngineManagerHandler::CreateDictionaryForEngine(
     int index, bool is_default) {
   TemplateURLTableModel* table_model = list_controller_->table_model();
   const TemplateURL* template_url = list_controller_->GetTemplateURL(index);
@@ skipping 124 matching lines @@
   }
   // Recheck validity.  It's possible to get here with invalid input if e.g. the
   // user calls the right JS functions directly from the web inspector.
   if (edit_controller_->IsTitleValid(name) &&
       edit_controller_->IsKeywordValid(keyword) &&
       edit_controller_->IsURLValid(url))
     edit_controller_->AcceptAddOrEdit(name, keyword, url);
 }
 
 }  // namespace options