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

Side by Side Diff: ios/chrome/browser/bookmarks/bookmark_model_factory.h

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? Created 4 years, 8 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 IOS_CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_ 5 #ifndef IOS_CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_
6 #define IOS_CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_ 6 #define IOS_CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "components/keyed_service/ios/browser_state_keyed_service_factory.h" 11 #include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
11 12
12 namespace base { 13 namespace base {
13 template <typename T> 14 template <typename T>
14 struct DefaultSingletonTraits; 15 struct DefaultSingletonTraits;
15 } // namespace base 16 } // namespace base
16 17
17 namespace bookmarks { 18 namespace bookmarks {
18 class BookmarkModel; 19 class BookmarkModel;
19 } 20 }
(...skipping 14 matching lines...) Expand all
34 35
35 private: 36 private:
36 friend struct base::DefaultSingletonTraits<BookmarkModelFactory>; 37 friend struct base::DefaultSingletonTraits<BookmarkModelFactory>;
37 38
38 BookmarkModelFactory(); 39 BookmarkModelFactory();
39 ~BookmarkModelFactory() override; 40 ~BookmarkModelFactory() override;
40 41
41 // BrowserStateKeyedServiceFactory implementation. 42 // BrowserStateKeyedServiceFactory implementation.
42 void RegisterBrowserStatePrefs( 43 void RegisterBrowserStatePrefs(
43 user_prefs::PrefRegistrySyncable* registry) override; 44 user_prefs::PrefRegistrySyncable* registry) override;
44 scoped_ptr<KeyedService> BuildServiceInstanceFor( 45 std::unique_ptr<KeyedService> BuildServiceInstanceFor(
45 web::BrowserState* context) const override; 46 web::BrowserState* context) const override;
46 web::BrowserState* GetBrowserStateToUse( 47 web::BrowserState* GetBrowserStateToUse(
47 web::BrowserState* context) const override; 48 web::BrowserState* context) const override;
48 bool ServiceIsNULLWhileTesting() const override; 49 bool ServiceIsNULLWhileTesting() const override;
49 50
50 DISALLOW_COPY_AND_ASSIGN(BookmarkModelFactory); 51 DISALLOW_COPY_AND_ASSIGN(BookmarkModelFactory);
51 }; 52 };
52 53
53 } // namespace ios 54 } // namespace ios
54 55
55 #endif // IOS_CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_ 56 #endif // IOS_CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_
OLDNEW
« no previous file with comments | « ios/chrome/browser/autofill/personal_data_manager_factory.cc ('k') | ios/chrome/browser/bookmarks/bookmark_model_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698