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

Side by Side Diff: ios/chrome/browser/favicon/ios_chrome_large_icon_service_factory.cc

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 #include "ios/chrome/browser/favicon/ios_chrome_large_icon_service_factory.h" 5 #include "ios/chrome/browser/favicon/ios_chrome_large_icon_service_factory.h"
6 6
7 #include "base/memory/ptr_util.h"
7 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
8 #include "base/thread_task_runner_handle.h" 9 #include "base/thread_task_runner_handle.h"
9 #include "components/favicon/core/large_icon_service.h" 10 #include "components/favicon/core/large_icon_service.h"
10 #include "components/keyed_service/core/service_access_type.h" 11 #include "components/keyed_service/core/service_access_type.h"
11 #include "components/keyed_service/ios/browser_state_dependency_manager.h" 12 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
12 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" 13 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h"
13 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" 14 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
14 #include "ios/chrome/browser/favicon/favicon_service_factory.h" 15 #include "ios/chrome/browser/favicon/favicon_service_factory.h"
15 #include "ios/web/public/web_thread.h" 16 #include "ios/web/public/web_thread.h"
16 17
(...skipping 10 matching lines...) Expand all
27 return base::Singleton<IOSChromeLargeIconServiceFactory>::get(); 28 return base::Singleton<IOSChromeLargeIconServiceFactory>::get();
28 } 29 }
29 30
30 IOSChromeLargeIconServiceFactory::IOSChromeLargeIconServiceFactory() 31 IOSChromeLargeIconServiceFactory::IOSChromeLargeIconServiceFactory()
31 : BrowserStateKeyedServiceFactory( 32 : BrowserStateKeyedServiceFactory(
32 "LargeIconService", 33 "LargeIconService",
33 BrowserStateDependencyManager::GetInstance()) {} 34 BrowserStateDependencyManager::GetInstance()) {}
34 35
35 IOSChromeLargeIconServiceFactory::~IOSChromeLargeIconServiceFactory() {} 36 IOSChromeLargeIconServiceFactory::~IOSChromeLargeIconServiceFactory() {}
36 37
37 scoped_ptr<KeyedService> 38 std::unique_ptr<KeyedService>
38 IOSChromeLargeIconServiceFactory::BuildServiceInstanceFor( 39 IOSChromeLargeIconServiceFactory::BuildServiceInstanceFor(
39 web::BrowserState* context) const { 40 web::BrowserState* context) const {
40 ios::ChromeBrowserState* browser_state = 41 ios::ChromeBrowserState* browser_state =
41 ios::ChromeBrowserState::FromBrowserState(context); 42 ios::ChromeBrowserState::FromBrowserState(context);
42 43
43 return make_scoped_ptr(new favicon::LargeIconService( 44 return base::WrapUnique(new favicon::LargeIconService(
44 ios::FaviconServiceFactory::GetForBrowserState( 45 ios::FaviconServiceFactory::GetForBrowserState(
45 browser_state, ServiceAccessType::EXPLICIT_ACCESS), 46 browser_state, ServiceAccessType::EXPLICIT_ACCESS),
46 web::WebThread::GetBlockingPool())); 47 web::WebThread::GetBlockingPool()));
47 } 48 }
48 49
49 web::BrowserState* IOSChromeLargeIconServiceFactory::GetBrowserStateToUse( 50 web::BrowserState* IOSChromeLargeIconServiceFactory::GetBrowserStateToUse(
50 web::BrowserState* context) const { 51 web::BrowserState* context) const {
51 return GetBrowserStateOwnInstanceInIncognito(context); 52 return GetBrowserStateOwnInstanceInIncognito(context);
52 } 53 }
OLDNEW
« no previous file with comments | « ios/chrome/browser/favicon/ios_chrome_large_icon_service_factory.h ('k') | ios/chrome/browser/favicon/large_icon_cache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698