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

Side by Side Diff: ios/chrome/browser/search_engines/template_url_service_factory.cc

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ToT Created 5 years, 3 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/search_engines/template_url_service_factory.h" 5 #include "ios/chrome/browser/search_engines/template_url_service_factory.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/singleton.h" 9 #include "base/memory/singleton.h"
10 #include "components/keyed_service/core/service_access_type.h" 10 #include "components/keyed_service/core/service_access_type.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 57
58 // static 58 // static
59 TemplateURLService* TemplateURLServiceFactory::GetForBrowserState( 59 TemplateURLService* TemplateURLServiceFactory::GetForBrowserState(
60 ios::ChromeBrowserState* browser_state) { 60 ios::ChromeBrowserState* browser_state) {
61 return static_cast<TemplateURLService*>( 61 return static_cast<TemplateURLService*>(
62 GetInstance()->GetServiceForBrowserState(browser_state, true)); 62 GetInstance()->GetServiceForBrowserState(browser_state, true));
63 } 63 }
64 64
65 // static 65 // static
66 TemplateURLServiceFactory* TemplateURLServiceFactory::GetInstance() { 66 TemplateURLServiceFactory* TemplateURLServiceFactory::GetInstance() {
67 return Singleton<TemplateURLServiceFactory>::get(); 67 return base::Singleton<TemplateURLServiceFactory>::get();
68 } 68 }
69 69
70 // static 70 // static
71 BrowserStateKeyedServiceFactory::TestingFactoryFunction 71 BrowserStateKeyedServiceFactory::TestingFactoryFunction
72 TemplateURLServiceFactory::GetDefaultFactory() { 72 TemplateURLServiceFactory::GetDefaultFactory() {
73 return &BuildTemplateURLService; 73 return &BuildTemplateURLService;
74 } 74 }
75 75
76 TemplateURLServiceFactory::TemplateURLServiceFactory() 76 TemplateURLServiceFactory::TemplateURLServiceFactory()
77 : BrowserStateKeyedServiceFactory( 77 : BrowserStateKeyedServiceFactory(
(...skipping 20 matching lines...) Expand all
98 web::BrowserState* TemplateURLServiceFactory::GetBrowserStateToUse( 98 web::BrowserState* TemplateURLServiceFactory::GetBrowserStateToUse(
99 web::BrowserState* context) const { 99 web::BrowserState* context) const {
100 return GetBrowserStateRedirectedInIncognito(context); 100 return GetBrowserStateRedirectedInIncognito(context);
101 } 101 }
102 102
103 bool TemplateURLServiceFactory::ServiceIsNULLWhileTesting() const { 103 bool TemplateURLServiceFactory::ServiceIsNULLWhileTesting() const {
104 return true; 104 return true;
105 } 105 }
106 106
107 } // namespace ios 107 } // namespace ios
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698