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

chrome/browser/search_engines/template_url_service.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/search_engines/template_url_service.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/guid.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/protector/base_setting_change.h"
 #include "chrome/browser/protector/protector_service.h"
 #include "chrome/browser/protector/protector_service_factory.h"
 #include "chrome/browser/protector/protector_utils.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/search_engines/search_host_to_urls_map.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/template_url_service_observer.h"
 #include "chrome/browser/search_engines/util.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
-#include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/common/constants.h"
 #include "net/base/net_util.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_error_factory.h"
 #include "sync/protocol/search_engine_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 474 matching lines @@
     } else {
       ++i;
     }
   }
   if (should_notify)
     NotifyObservers();
 }
 
 
 void TemplateURLService::RegisterExtensionKeyword(
-    const extensions::Extension* extension) {
-  // TODO(mpcomplete): disable the keyword when the extension is disabled.
-  if (extension->omnibox_keyword().empty())
-    return;
+    const std::string& extension_id,
+    const std::string& extension_name,
+    const std::string& keyword) {
+  DCHECK(loaded_);
 
-  Load();
-  if (!loaded_) {
-    pending_extension_ids_.push_back(extension->id());
-    return;
-  }
-
-  if (!GetTemplateURLForExtension(extension)) {
+  if (!GetTemplateURLForExtension(extension_id)) {
     TemplateURLData data;
-    data.short_name = UTF8ToUTF16(extension->name());
-    data.SetKeyword(UTF8ToUTF16(extension->omnibox_keyword()));
+    data.short_name = UTF8ToUTF16(extension_name);
+    data.SetKeyword(UTF8ToUTF16(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.
     data.SetURL(std::string(extensions::kExtensionScheme) + "://" +
-        extension->id() + "/?q={searchTerms}");
+        extension_id + "/?q={searchTerms}");
     Add(new TemplateURL(profile_, data));
   }
 }
 
 void TemplateURLService::UnregisterExtensionKeyword(
-    const extensions::Extension* extension) {
-  if (loaded_) {
-    TemplateURL* url = GetTemplateURLForExtension(extension);
-    if (url)
-      Remove(url);
-  } else {
-    PendingExtensionIDs::iterator i = std::find(pending_extension_ids_.begin(),
-        pending_extension_ids_.end(), extension->id());
-    if (i != pending_extension_ids_.end())
-      pending_extension_ids_.erase(i);
-  }
+    const std::string& extension_id) {
+  DCHECK(loaded_);
+  TemplateURL* url = GetTemplateURLForExtension(extension_id);
+  if (url)
+    Remove(url);
 }
 
 TemplateURL* TemplateURLService::GetTemplateURLForExtension(
-    const extensions::Extension* extension) {
+    const std::string& extension_id) {
   for (TemplateURLVector::const_iterator i = template_urls_.begin();
        i != template_urls_.end(); ++i) {
     if ((*i)->IsExtensionKeyword() &&
-        ((*i)->url_ref().GetHost() == extension->id()))
+        ((*i)->url_ref().GetHost() == extension_id))
       return *i;
   }
 
   return NULL;
 }
 
 TemplateURLService::TemplateURLVector TemplateURLService::GetTemplateURLs() {
   return template_urls_;
 }
 
@@ skipping 1020 matching lines @@
   UIThreadSearchTermsData search_terms_data(profile_);
   provider_map_->Init(template_urls_, search_terms_data);
   loaded_ = true;
 }
 
 void TemplateURLService::NotifyLoaded() {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
       content::Source<TemplateURLService>(this),
       content::NotificationService::NoDetails());
-
-  for (PendingExtensionIDs::const_iterator i(pending_extension_ids_.begin());
-       i != pending_extension_ids_.end(); ++i) {
-    const extensions::Extension* extension =
-        extensions::ExtensionSystem::Get(profile_)->extension_service()->
-            GetExtensionById(*i, true);
-    if (extension)
-      RegisterExtensionKeyword(extension);
-  }
-  pending_extension_ids_.clear();
 }
 
 void TemplateURLService::SaveDefaultSearchProviderToPrefs(
     const TemplateURL* t_url) {
   PrefService* prefs = GetPrefs();
   if (!prefs)
     return;
 
   bool enabled = false;
   std::string search_url;
@@ skipping 921 matching lines @@
     // TODO(mpcomplete): If we allow editing extension keywords, then those
     // should be persisted to disk and synced.
     if (template_url->sync_guid().empty() &&
         !template_url->IsExtensionKeyword()) {
       template_url->data_.sync_guid = base::GenerateGUID();
       if (service_.get())
         service_->UpdateKeyword(template_url->data());
     }
   }
 }