diff options
Diffstat (limited to 'chrome/browser/search/suggestions')
3 files changed, 7 insertions, 8 deletions
diff --git a/chrome/browser/search/suggestions/suggestions_service.h b/chrome/browser/search/suggestions/suggestions_service.h index b3430f0..972cfce 100644 --- a/chrome/browser/search/suggestions/suggestions_service.h +++ b/chrome/browser/search/suggestions/suggestions_service.h @@ -13,7 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "chrome/browser/search/suggestions/proto/suggestions.pb.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" #include "net/url_request/url_fetcher_delegate.h" #include "url/gurl.h" @@ -27,8 +27,7 @@ extern const char kSuggestionsFieldTrialStateParam[]; extern const char kSuggestionsFieldTrialStateEnabled[]; // An interface to fetch server suggestions asynchronously. -class SuggestionsService : public BrowserContextKeyedService, - public net::URLFetcherDelegate { +class SuggestionsService : public KeyedService, public net::URLFetcherDelegate { public: typedef base::Callback<void(const SuggestionsProfile&)> ResponseCallback; @@ -52,7 +51,7 @@ class SuggestionsService : public BrowserContextKeyedService, // and dispatches them to callbacks stored in queue. virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; - // BrowserContextKeyedService implementation. + // KeyedService implementation. virtual void Shutdown() OVERRIDE; // Contains the current suggestions fetch request. Will only have a value diff --git a/chrome/browser/search/suggestions/suggestions_service_factory.cc b/chrome/browser/search/suggestions/suggestions_service_factory.cc index 8c68a41..557291f 100644 --- a/chrome/browser/search/suggestions/suggestions_service_factory.cc +++ b/chrome/browser/search/suggestions/suggestions_service_factory.cc @@ -9,7 +9,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/suggestions/suggestions_service.h" #include "chrome/common/pref_names.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/user_prefs/pref_registry_syncable.h" namespace suggestions { @@ -43,7 +43,7 @@ content::BrowserContext* SuggestionsServiceFactory::GetBrowserContextToUse( return chrome::GetBrowserContextRedirectedInIncognito(context); } -BrowserContextKeyedService* SuggestionsServiceFactory::BuildServiceInstanceFor( +KeyedService* SuggestionsServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { return new SuggestionsService(static_cast<Profile*>(profile)); } diff --git a/chrome/browser/search/suggestions/suggestions_service_factory.h b/chrome/browser/search/suggestions/suggestions_service_factory.h index 6bef856..b939c74 100644 --- a/chrome/browser/search/suggestions/suggestions_service_factory.h +++ b/chrome/browser/search/suggestions/suggestions_service_factory.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_SEARCH_SUGGESTIONS_SUGGESTIONS_SERVICE_FACTORY_H_ #include "base/memory/singleton.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h" +#include "components/keyed_service/content/browser_context_keyed_service_factory.h" class Profile; @@ -32,7 +32,7 @@ class SuggestionsServiceFactory : public BrowserContextKeyedServiceFactory { // Overrides from BrowserContextKeyedServiceFactory: virtual content::BrowserContext* GetBrowserContextToUse( content::BrowserContext* context) const OVERRIDE; - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* profile) const OVERRIDE; DISALLOW_COPY_AND_ASSIGN(SuggestionsServiceFactory); |