| Index: chrome/browser/supervised_user/supervised_user_settings_service_factory.cc
|
| diff --git a/chrome/browser/managed_mode/managed_user_settings_service_factory.cc b/chrome/browser/supervised_user/supervised_user_settings_service_factory.cc
|
| similarity index 45%
|
| rename from chrome/browser/managed_mode/managed_user_settings_service_factory.cc
|
| rename to chrome/browser/supervised_user/supervised_user_settings_service_factory.cc
|
| index 51f1a84f377a1710b8756430a269eef79a81a01e..2acb526fc5aef3312fd91feeb156307e4984b672 100644
|
| --- a/chrome/browser/managed_mode/managed_user_settings_service_factory.cc
|
| +++ b/chrome/browser/supervised_user/supervised_user_settings_service_factory.cc
|
| @@ -2,42 +2,42 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/managed_mode/managed_user_settings_service_factory.h"
|
| +#include "chrome/browser/supervised_user/supervised_user_settings_service_factory.h"
|
|
|
| -#include "chrome/browser/managed_mode/managed_user_settings_service.h"
|
| #include "chrome/browser/profiles/incognito_helpers.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| +#include "chrome/browser/supervised_user/supervised_user_settings_service.h"
|
| #include "components/keyed_service/content/browser_context_dependency_manager.h"
|
|
|
| // static
|
| -ManagedUserSettingsService*
|
| -ManagedUserSettingsServiceFactory::GetForProfile(Profile* profile) {
|
| - return static_cast<ManagedUserSettingsService*>(
|
| +SupervisedUserSettingsService*
|
| +SupervisedUserSettingsServiceFactory::GetForProfile(Profile* profile) {
|
| + return static_cast<SupervisedUserSettingsService*>(
|
| GetInstance()->GetServiceForBrowserContext(profile, true));
|
| }
|
|
|
| // static
|
| -ManagedUserSettingsServiceFactory*
|
| -ManagedUserSettingsServiceFactory::GetInstance() {
|
| - return Singleton<ManagedUserSettingsServiceFactory>::get();
|
| +SupervisedUserSettingsServiceFactory*
|
| +SupervisedUserSettingsServiceFactory::GetInstance() {
|
| + return Singleton<SupervisedUserSettingsServiceFactory>::get();
|
| }
|
|
|
| -ManagedUserSettingsServiceFactory::ManagedUserSettingsServiceFactory()
|
| +SupervisedUserSettingsServiceFactory::SupervisedUserSettingsServiceFactory()
|
| : BrowserContextKeyedServiceFactory(
|
| - "ManagedUserSettingsService",
|
| + "SupervisedUserSettingsService",
|
| BrowserContextDependencyManager::GetInstance()) {
|
| }
|
|
|
| -ManagedUserSettingsServiceFactory::
|
| - ~ManagedUserSettingsServiceFactory() {}
|
| +SupervisedUserSettingsServiceFactory::
|
| + ~SupervisedUserSettingsServiceFactory() {}
|
|
|
| -KeyedService* ManagedUserSettingsServiceFactory::BuildServiceInstanceFor(
|
| +KeyedService* SupervisedUserSettingsServiceFactory::BuildServiceInstanceFor(
|
| content::BrowserContext* profile) const {
|
| - return new ManagedUserSettingsService();
|
| + return new SupervisedUserSettingsService();
|
| }
|
|
|
| content::BrowserContext*
|
| -ManagedUserSettingsServiceFactory::GetBrowserContextToUse(
|
| +SupervisedUserSettingsServiceFactory::GetBrowserContextToUse(
|
| content::BrowserContext* context) const {
|
| return chrome::GetBrowserContextRedirectedInIncognito(context);
|
| }
|
|
|