Chromium Code Reviews| OLD | NEW | 
|---|---|
| 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/macros.h" | 8 #include "base/macros.h" | 
| 9 #include "components/keyed_service/content/browser_context_keyed_service_factory .h" | 9 #include "components/keyed_service/content/browser_context_keyed_service_factory .h" | 
| 10 | 10 | 
| 11 namespace base { | 11 namespace base { | 
| 12 template <typename T> struct DefaultSingletonTraits; | 12 template <typename T> struct DefaultSingletonTraits; | 
| 13 } | 13 } | 
| 14 | 14 | 
| 15 class Profile; | 15 class Profile; | 
| 16 | 16 | 
| 17 namespace bookmarks { | 17 namespace bookmarks { | 
| 18 class BookmarkModel; | 18 class BookmarkModel; | 
| 19 } | 19 } | 
| 20 | 20 | 
| 21 // Singleton that owns all BookmarkModels and associates them with Profiles. | 21 // Singleton that owns all BookmarkModels and associates them with Profiles. | 
| 22 class BookmarkModelFactory : public BrowserContextKeyedServiceFactory { | 22 class BookmarkModelFactory : public BrowserContextKeyedServiceFactory { | 
| 23 public: | 23 public: | 
| 24 static bookmarks::BookmarkModel* GetForBrowserContext( | |
| 25 content::BrowserContext* context); | |
| 26 | |
| 24 static bookmarks::BookmarkModel* GetForProfile(Profile* profile); | 27 static bookmarks::BookmarkModel* GetForProfile(Profile* profile); | 
| 
 
sky
2016/08/03 19:30:27
Remove this and convert to using new functions.
 
Philipp Keck
2016/08/04 11:25:48
Ok. Since that will affect almost 100 places in th
 
 | |
| 25 | 28 | 
| 26 static bookmarks::BookmarkModel* GetForProfileIfExists(Profile* profile); | 29 static bookmarks::BookmarkModel* GetForProfileIfExists(Profile* profile); | 
| 27 | 30 | 
| 28 static BookmarkModelFactory* GetInstance(); | 31 static BookmarkModelFactory* GetInstance(); | 
| 29 | 32 | 
| 30 private: | 33 private: | 
| 31 friend struct base::DefaultSingletonTraits<BookmarkModelFactory>; | 34 friend struct base::DefaultSingletonTraits<BookmarkModelFactory>; | 
| 32 | 35 | 
| 33 BookmarkModelFactory(); | 36 BookmarkModelFactory(); | 
| 34 ~BookmarkModelFactory() override; | 37 ~BookmarkModelFactory() override; | 
| 35 | 38 | 
| 36 // BrowserContextKeyedServiceFactory: | 39 // BrowserContextKeyedServiceFactory: | 
| 37 KeyedService* BuildServiceInstanceFor( | 40 KeyedService* BuildServiceInstanceFor( | 
| 38 content::BrowserContext* context) const override; | 41 content::BrowserContext* context) const override; | 
| 39 void RegisterProfilePrefs( | 42 void RegisterProfilePrefs( | 
| 40 user_prefs::PrefRegistrySyncable* registry) override; | 43 user_prefs::PrefRegistrySyncable* registry) override; | 
| 41 content::BrowserContext* GetBrowserContextToUse( | 44 content::BrowserContext* GetBrowserContextToUse( | 
| 42 content::BrowserContext* context) const override; | 45 content::BrowserContext* context) const override; | 
| 43 bool ServiceIsNULLWhileTesting() const override; | 46 bool ServiceIsNULLWhileTesting() const override; | 
| 44 | 47 | 
| 45 DISALLOW_COPY_AND_ASSIGN(BookmarkModelFactory); | 48 DISALLOW_COPY_AND_ASSIGN(BookmarkModelFactory); | 
| 46 }; | 49 }; | 
| 47 | 50 | 
| 48 #endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_ | 51 #endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_ | 
| OLD | NEW |