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

Side by Side Diff: chrome/browser/bookmarks/bookmark_model_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_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_ 5 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_
6 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_ 6 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.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 template <typename T> struct DefaultSingletonTraits; 12 template <typename T> struct DefaultSingletonTraits;
13 13
14 class Profile; 14 class Profile;
15 class BookmarkModel; 15 class BookmarkModel;
tfarina 2013/05/22 00:28:03 while you are here, could you sort this alphabetic
16 16
17 // Singleton that owns all BookmarkModel and associates them with Profiles. 17 // Singleton that owns all BookmarkModel and associates them with Profiles.
18 class BookmarkModelFactory : public ProfileKeyedServiceFactory { 18 class BookmarkModelFactory : public BrowserContextKeyedServiceFactory {
19 public: 19 public:
20 static BookmarkModel* GetForProfile(Profile* profile); 20 static BookmarkModel* GetForProfile(Profile* profile);
21 21
22 static BookmarkModel* GetForProfileIfExists(Profile* profile); 22 static BookmarkModel* GetForProfileIfExists(Profile* profile);
23 23
24 static BookmarkModelFactory* GetInstance(); 24 static BookmarkModelFactory* GetInstance();
25 25
26 private: 26 private:
27 friend struct DefaultSingletonTraits<BookmarkModelFactory>; 27 friend struct DefaultSingletonTraits<BookmarkModelFactory>;
28 28
29 BookmarkModelFactory(); 29 BookmarkModelFactory();
30 virtual ~BookmarkModelFactory(); 30 virtual ~BookmarkModelFactory();
31 31
32 // ProfileKeyedServiceFactory: 32 // BrowserContextKeyedServiceFactory:
33 virtual ProfileKeyedService* BuildServiceInstanceFor( 33 virtual BrowserContextKeyedService* BuildServiceInstanceFor(
34 content::BrowserContext* context) const OVERRIDE; 34 content::BrowserContext* context) const OVERRIDE;
35 virtual void RegisterUserPrefs( 35 virtual void RegisterUserPrefs(
36 user_prefs::PrefRegistrySyncable* registry) OVERRIDE; 36 user_prefs::PrefRegistrySyncable* registry) OVERRIDE;
37 virtual content::BrowserContext* GetBrowserContextToUse( 37 virtual content::BrowserContext* GetBrowserContextToUse(
38 content::BrowserContext* context) const OVERRIDE; 38 content::BrowserContext* context) const OVERRIDE;
39 virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; 39 virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
40 40
41 DISALLOW_COPY_AND_ASSIGN(BookmarkModelFactory); 41 DISALLOW_COPY_AND_ASSIGN(BookmarkModelFactory);
42 }; 42 };
43 43
44 #endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_ 44 #endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698