Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(207)

Side by Side Diff: chrome/browser/history/history_service_factory.h

Issue 15517005: Remove references to Profile from browser_context_keyed_service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_HISTORY_HISTORY_SERVICE_FACTORY_H_ 5 #ifndef CHROME_BROWSER_HISTORY_HISTORY_SERVICE_FACTORY_H_
6 #define CHROME_BROWSER_HISTORY_HISTORY_SERVICE_FACTORY_H_ 6 #define CHROME_BROWSER_HISTORY_HISTORY_SERVICE_FACTORY_H_
7 7
8 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "components/browser_context_keyed_service/browser_context_keyed_service _factory.h" 10 #include "components/browser_context_keyed_service/browser_context_keyed_service _factory.h"
11 11
12 class HistoryService; 12 class HistoryService;
13 13
14 // Singleton that owns all HistoryService and associates them with 14 // Singleton that owns all HistoryService and associates them with
15 // Profiles. 15 // Profiles.
16 class HistoryServiceFactory : public ProfileKeyedServiceFactory { 16 class HistoryServiceFactory : public BrowserContextKeyedServiceFactory {
17 public: 17 public:
18 static HistoryService* GetForProfile( 18 static HistoryService* GetForProfile(
19 Profile* profile, Profile::ServiceAccessType sat); 19 Profile* profile, Profile::ServiceAccessType sat);
20 20
21 static HistoryService* GetForProfileIfExists( 21 static HistoryService* GetForProfileIfExists(
22 Profile* profile, Profile::ServiceAccessType sat); 22 Profile* profile, Profile::ServiceAccessType sat);
23 23
24 static HistoryService* GetForProfileWithoutCreating( 24 static HistoryService* GetForProfileWithoutCreating(
25 Profile* profile); 25 Profile* profile);
26 26
27 static HistoryServiceFactory* GetInstance(); 27 static HistoryServiceFactory* GetInstance();
28 28
29 // In the testing profile, we often clear the history before making a new 29 // In the testing profile, we often clear the history before making a new
30 // one. This takes care of that work. It should only be used in tests. 30 // one. This takes care of that work. It should only be used in tests.
31 // Note: This does not do any cleanup; it only destroys the service. The 31 // Note: This does not do any cleanup; it only destroys the service. The
32 // calling test is expected to do the cleanup before calling this function. 32 // calling test is expected to do the cleanup before calling this function.
33 static void ShutdownForProfile(Profile* profile); 33 static void ShutdownForProfile(Profile* profile);
34 34
35 private: 35 private:
36 friend struct DefaultSingletonTraits<HistoryServiceFactory>; 36 friend struct DefaultSingletonTraits<HistoryServiceFactory>;
37 37
38 HistoryServiceFactory(); 38 HistoryServiceFactory();
39 virtual ~HistoryServiceFactory(); 39 virtual ~HistoryServiceFactory();
40 40
41 // ProfileKeyedServiceFactory: 41 // BrowserContextKeyedServiceFactory:
42 virtual ProfileKeyedService* BuildServiceInstanceFor( 42 virtual BrowserContextKeyedService* BuildServiceInstanceFor(
43 content::BrowserContext* context) const OVERRIDE; 43 content::BrowserContext* context) const OVERRIDE;
44 virtual content::BrowserContext* GetBrowserContextToUse( 44 virtual content::BrowserContext* GetBrowserContextToUse(
45 content::BrowserContext* context) const OVERRIDE; 45 content::BrowserContext* context) const OVERRIDE;
46 virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; 46 virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
47 }; 47 };
48 48
49 #endif // CHROME_BROWSER_HISTORY_HISTORY_SERVICE_FACTORY_H_ 49 #endif // CHROME_BROWSER_HISTORY_HISTORY_SERVICE_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698