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

Unified Diff: chrome/browser/supervised_user/chromeos/manager_password_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/chromeos/manager_password_service_factory.cc
diff --git a/chrome/browser/managed_mode/chromeos/manager_password_service_factory.cc b/chrome/browser/supervised_user/chromeos/manager_password_service_factory.cc
similarity index 75%
rename from chrome/browser/managed_mode/chromeos/manager_password_service_factory.cc
rename to chrome/browser/supervised_user/chromeos/manager_password_service_factory.cc
index 975de94dd95175cc37fc57ddc7093021c62eeca8..0778b82e668dd4d9b58272d15486cdb7534ed031 100644
--- a/chrome/browser/managed_mode/chromeos/manager_password_service_factory.cc
+++ b/chrome/browser/supervised_user/chromeos/manager_password_service_factory.cc
@@ -2,16 +2,16 @@
// 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/chromeos/manager_password_service_factory.h"
+#include "chrome/browser/supervised_user/chromeos/manager_password_service_factory.h"
#include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
#include "chrome/browser/chromeos/login/users/user.h"
#include "chrome/browser/chromeos/login/users/user_manager.h"
-#include "chrome/browser/managed_mode/chromeos/manager_password_service.h"
-#include "chrome/browser/managed_mode/managed_user_shared_settings_service_factory.h"
-#include "chrome/browser/managed_mode/managed_user_sync_service_factory.h"
#include "chrome/browser/profiles/incognito_helpers.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/supervised_user/chromeos/manager_password_service.h"
+#include "chrome/browser/supervised_user/supervised_user_shared_settings_service_factory.h"
+#include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
namespace chromeos {
@@ -33,8 +33,8 @@ ManagerPasswordServiceFactory::ManagerPasswordServiceFactory()
: BrowserContextKeyedServiceFactory(
"ManagerPasswordService",
BrowserContextDependencyManager::GetInstance()) {
- DependsOn(ManagedUserSharedSettingsServiceFactory::GetInstance());
- DependsOn(ManagedUserSyncServiceFactory::GetInstance());
+ DependsOn(SupervisedUserSharedSettingsServiceFactory::GetInstance());
+ DependsOn(SupervisedUserSyncServiceFactory::GetInstance());
}
ManagerPasswordServiceFactory::
@@ -50,8 +50,9 @@ KeyedService* ManagerPasswordServiceFactory::BuildServiceInstanceFor(
ManagerPasswordService* result = new ManagerPasswordService();
result->Init(
user->email(),
- ManagedUserSyncServiceFactory::GetForProfile(profile),
- ManagedUserSharedSettingsServiceFactory::GetForBrowserContext(profile));
+ SupervisedUserSyncServiceFactory::GetForProfile(profile),
+ SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext(
+ profile));
return result;
}
return NULL;

Powered by Google App Engine
This is Rietveld 408576698