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

Side by Side Diff: ios/chrome/browser/favicon/favicon_service_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_FAVICON_FAVICON_SERVICE_FACTORY_H_ 5 #ifndef IOS_CHROME_BROWSER_FAVICON_FAVICON_SERVICE_FACTORY_H_
6 #define IOS_CHROME_BROWSER_FAVICON_FAVICON_SERVICE_FACTORY_H_ 6 #define IOS_CHROME_BROWSER_FAVICON_FAVICON_SERVICE_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 enum class ServiceAccessType; 18 enum class ServiceAccessType;
18 19
19 namespace favicon { 20 namespace favicon {
(...skipping 13 matching lines...) Expand all
33 ServiceAccessType access_type); 34 ServiceAccessType access_type);
34 static FaviconServiceFactory* GetInstance(); 35 static FaviconServiceFactory* GetInstance();
35 36
36 private: 37 private:
37 friend struct base::DefaultSingletonTraits<FaviconServiceFactory>; 38 friend struct base::DefaultSingletonTraits<FaviconServiceFactory>;
38 39
39 FaviconServiceFactory(); 40 FaviconServiceFactory();
40 ~FaviconServiceFactory() override; 41 ~FaviconServiceFactory() override;
41 42
42 // BrowserStateKeyedServiceFactory implementation. 43 // BrowserStateKeyedServiceFactory implementation.
43 scoped_ptr<KeyedService> BuildServiceInstanceFor( 44 std::unique_ptr<KeyedService> BuildServiceInstanceFor(
44 web::BrowserState* context) const override; 45 web::BrowserState* context) const override;
45 46
46 DISALLOW_COPY_AND_ASSIGN(FaviconServiceFactory); 47 DISALLOW_COPY_AND_ASSIGN(FaviconServiceFactory);
47 }; 48 };
48 49
49 } // namespace ios 50 } // namespace ios
50 51
51 #endif // IOS_CHROME_BROWSER_FAVICON_FAVICON_SERVICE_FACTORY_H_ 52 #endif // IOS_CHROME_BROWSER_FAVICON_FAVICON_SERVICE_FACTORY_H_
OLDNEW
« no previous file with comments | « ios/chrome/browser/favicon/favicon_loader.mm ('k') | ios/chrome/browser/favicon/favicon_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698