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

Unified Diff: chrome/browser/supervised_user/supervised_user_service_factory.cc

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments (+ a few other cleanups) Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/supervised_user/supervised_user_service_factory.cc
diff --git a/chrome/browser/managed_mode/managed_user_service_factory.cc b/chrome/browser/supervised_user/supervised_user_service_factory.cc
similarity index 57%
rename from chrome/browser/managed_mode/managed_user_service_factory.cc
rename to chrome/browser/supervised_user/supervised_user_service_factory.cc
index 249adaa4f89a783161f87a17e2a3e0ff9b8f64a3..3af46bad90a8898c430d62b4d30ae2b72607d996 100644
--- a/chrome/browser/managed_mode/managed_user_service_factory.cc
+++ b/chrome/browser/supervised_user/supervised_user_service_factory.cc
@@ -2,49 +2,50 @@
// 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_service_factory.h"
+#include "chrome/browser/supervised_user/supervised_user_service_factory.h"
-#include "chrome/browser/managed_mode/managed_user_service.h"
#include "chrome/browser/profiles/incognito_helpers.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
+#include "chrome/browser/supervised_user/supervised_user_service.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "extensions/browser/extension_system_provider.h"
#include "extensions/browser/extensions_browser_client.h"
// static
-ManagedUserService* ManagedUserServiceFactory::GetForProfile(Profile* profile) {
- return static_cast<ManagedUserService*>(
+SupervisedUserService* SupervisedUserServiceFactory::GetForProfile(
+ Profile* profile) {
+ return static_cast<SupervisedUserService*>(
GetInstance()->GetServiceForBrowserContext(profile, true));
}
// static
-ManagedUserServiceFactory* ManagedUserServiceFactory::GetInstance() {
- return Singleton<ManagedUserServiceFactory>::get();
+SupervisedUserServiceFactory* SupervisedUserServiceFactory::GetInstance() {
+ return Singleton<SupervisedUserServiceFactory>::get();
}
// static
-KeyedService* ManagedUserServiceFactory::BuildInstanceFor(Profile* profile) {
- return new ManagedUserService(profile);
+KeyedService* SupervisedUserServiceFactory::BuildInstanceFor(Profile* profile) {
+ return new SupervisedUserService(profile);
}
-ManagedUserServiceFactory::ManagedUserServiceFactory()
+SupervisedUserServiceFactory::SupervisedUserServiceFactory()
: BrowserContextKeyedServiceFactory(
- "ManagedUserService",
+ "SupervisedUserService",
BrowserContextDependencyManager::GetInstance()) {
DependsOn(
extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance());
}
-ManagedUserServiceFactory::~ManagedUserServiceFactory() {}
+SupervisedUserServiceFactory::~SupervisedUserServiceFactory() {}
-content::BrowserContext* ManagedUserServiceFactory::GetBrowserContextToUse(
+content::BrowserContext* SupervisedUserServiceFactory::GetBrowserContextToUse(
content::BrowserContext* context) const {
return chrome::GetBrowserContextRedirectedInIncognito(context);
}
-KeyedService* ManagedUserServiceFactory::BuildServiceInstanceFor(
+KeyedService* SupervisedUserServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* profile) const {
return BuildInstanceFor(static_cast<Profile*>(profile));
}

Powered by Google App Engine
This is Rietveld 408576698