Index: chrome/browser/extensions/api/omnibox/omnibox_api.h |
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.h b/chrome/browser/extensions/api/omnibox/omnibox_api.h |
index db0ba837c72e8f127b62088f4291b6014c0ace1d..484933b2bac27ece76c54de709d6413352f33b14 100644 |
--- a/chrome/browser/extensions/api/omnibox/omnibox_api.h |
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api.h |
@@ -12,9 +12,9 @@ |
#include "base/memory/scoped_ptr.h" |
#include "base/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/profiles/profile_keyed_service.h" |
#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/notification_registrar.h" |
@@ -78,7 +78,7 @@ class OmniboxSendSuggestionsFunction : public SyncExtensionFunction { |
virtual bool RunImpl() OVERRIDE; |
}; |
-class OmniboxAPI : public ProfileKeyedService, |
+class OmniboxAPI : public ProfileKeyedAPI, |
public content::NotificationObserver { |
public: |
explicit OmniboxAPI(Profile* profile); |
@@ -103,8 +103,16 @@ class OmniboxAPI : public ProfileKeyedService, |
gfx::Image GetOmniboxPopupIcon(const std::string& extension_id); |
private: |
+ friend class ProfileKeyedAPIFactory<OmniboxAPI>; |
+ |
typedef std::set<const Extension*> PendingExtensions; |
+ // ProfileKeyedAPI implementation. |
+ static const char* service_name() { |
+ return "OmniboxAPI"; |
+ } |
+ static const bool kServiceRedirectedInIncognito = true; |
+ |
TemplateURLService* url_service_; |
// List of extensions waiting for the TemplateURLService to Load to |
@@ -116,8 +124,14 @@ class OmniboxAPI : public ProfileKeyedService, |
// Keeps track of favicon-sized omnibox icons for extensions. |
ExtensionIconManager omnibox_icon_manager_; |
ExtensionIconManager omnibox_popup_icon_manager_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(OmniboxAPI); |
}; |
+template <> |
+ProfileKeyedAPIFactory<OmniboxAPI>* |
+ProfileKeyedAPIFactory<OmniboxAPI>::GetInstance(); |
+ |
class OmniboxSetDefaultSuggestionFunction : public SyncExtensionFunction { |
public: |
DECLARE_EXTENSION_FUNCTION_NAME("omnibox.setDefaultSuggestion"); |