| OLD | NEW |
| 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/signin/account_consistency_service_factory.h" | 5 #include "ios/chrome/browser/signin/account_consistency_service_factory.h" |
| 6 | 6 |
| 7 #include "base/memory/singleton.h" | 7 #include "base/memory/singleton.h" |
| 8 #include "components/keyed_service/ios/browser_state_dependency_manager.h" | 8 #include "components/keyed_service/ios/browser_state_dependency_manager.h" |
| 9 #include "components/signin/ios/browser/account_consistency_service.h" | 9 #include "components/signin/ios/browser/account_consistency_service.h" |
| 10 #include "ios/chrome/browser/content_settings/cookie_settings_factory.h" | 10 #include "ios/chrome/browser/content_settings/cookie_settings_factory.h" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 if (!experimental_flags::IsWKWebViewEnabled()) { | 32 if (!experimental_flags::IsWKWebViewEnabled()) { |
| 33 return nullptr; | 33 return nullptr; |
| 34 } | 34 } |
| 35 return static_cast<AccountConsistencyService*>( | 35 return static_cast<AccountConsistencyService*>( |
| 36 GetInstance()->GetServiceForBrowserState(browser_state, true)); | 36 GetInstance()->GetServiceForBrowserState(browser_state, true)); |
| 37 } | 37 } |
| 38 | 38 |
| 39 // static | 39 // static |
| 40 AccountConsistencyServiceFactory* | 40 AccountConsistencyServiceFactory* |
| 41 AccountConsistencyServiceFactory::GetInstance() { | 41 AccountConsistencyServiceFactory::GetInstance() { |
| 42 return Singleton<AccountConsistencyServiceFactory>::get(); | 42 return base::Singleton<AccountConsistencyServiceFactory>::get(); |
| 43 } | 43 } |
| 44 | 44 |
| 45 scoped_ptr<KeyedService> | 45 scoped_ptr<KeyedService> |
| 46 AccountConsistencyServiceFactory::BuildServiceInstanceFor( | 46 AccountConsistencyServiceFactory::BuildServiceInstanceFor( |
| 47 web::BrowserState* context) const { | 47 web::BrowserState* context) const { |
| 48 ios::ChromeBrowserState* chrome_browser_state = | 48 ios::ChromeBrowserState* chrome_browser_state = |
| 49 ios::ChromeBrowserState::FromBrowserState(context); | 49 ios::ChromeBrowserState::FromBrowserState(context); |
| 50 return make_scoped_ptr(new AccountConsistencyService( | 50 return make_scoped_ptr(new AccountConsistencyService( |
| 51 chrome_browser_state, | 51 chrome_browser_state, |
| 52 ios::CookieSettingsFactory::GetForBrowserState(chrome_browser_state), | 52 ios::CookieSettingsFactory::GetForBrowserState(chrome_browser_state), |
| 53 GaiaCookieManagerServiceFactory::GetForBrowserState(chrome_browser_state), | 53 GaiaCookieManagerServiceFactory::GetForBrowserState(chrome_browser_state), |
| 54 ios::SigninManagerFactory::GetForBrowserState(chrome_browser_state))); | 54 ios::SigninManagerFactory::GetForBrowserState(chrome_browser_state))); |
| 55 } | 55 } |
| 56 | 56 |
| 57 } // namespace ios | 57 } // namespace ios |
| OLD | NEW |