Convert NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED to CallbackList

chrome/browser/extensions/api/omnibox/omnibox_api.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_OMNIBOX_OMNIBOX_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_OMNIBOX_OMNIBOX_API_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"

[Avi (use Gerrit), 2013/10/02 22:27:52]

not used; don't include

[Cait (Slow), 2013/10/03 15:36:45]

Done.

 #include "base/strings/string16.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/extensions/extension_icon_manager.h"
+#include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/common/extensions/api/omnibox.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/base/window_open_disposition.h"
 
 class Profile;
 class TemplateURL;
 class TemplateURLService;
 
 namespace base {
@@ skipping 63 matching lines @@
   static ProfileKeyedAPIFactory<OmniboxAPI>* GetFactoryInstance();
 
   // Convenience method to get the OmniboxAPI for a profile.
   static OmniboxAPI* Get(Profile* profile);
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  // BrowserContextKeyedService implementation.
+  virtual void Shutdown() OVERRIDE;
+
   // Returns the icon to display in the omnibox for the given extension.
   gfx::Image GetOmniboxIcon(const std::string& extension_id);
 
   // Returns the icon to display in the omnibox popup window for the given
   // extension.
   gfx::Image GetOmniboxPopupIcon(const std::string& extension_id);
 
  private:
   friend class ProfileKeyedAPIFactory<OmniboxAPI>;
 
   typedef std::set<const Extension*> PendingExtensions;
 
+  void OnTemplateURLsLoaded();
+
   // ProfileKeyedAPI implementation.
   static const char* service_name() {
     return "OmniboxAPI";
   }
   static const bool kServiceRedirectedInIncognito = true;
 
   Profile* profile_;
 
   TemplateURLService* url_service_;
 
   // List of extensions waiting for the TemplateURLService to Load to
   // have keywords registered.
   PendingExtensions pending_extensions_;
 
   content::NotificationRegistrar registrar_;
 
   // Keeps track of favicon-sized omnibox icons for extensions.
   ExtensionIconManager omnibox_icon_manager_;
   ExtensionIconManager omnibox_popup_icon_manager_;
 
+  scoped_ptr<TemplateURLService::Subscription> template_url_sub_;
+
   DISALLOW_COPY_AND_ASSIGN(OmniboxAPI);
 };
 
 template <>
 void ProfileKeyedAPIFactory<OmniboxAPI>::DeclareFactoryDependencies();
 
 class OmniboxSetDefaultSuggestionFunction : public SyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("omnibox.setDefaultSuggestion",
                              OMNIBOX_SETDEFAULTSUGGESTION)
@@ skipping 14 matching lines @@
     AutocompleteMatch* match);
 
 // This function converts style information populated by the JSON schema
 // // compiler into an ACMatchClassifications object.
 ACMatchClassifications StyleTypesToACMatchClassifications(
     const api::omnibox::SuggestResult &suggestion);
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_OMNIBOX_OMNIBOX_API_H_