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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/managed_mode/chromeos/manager_password_service_factory. h" 5 #include "chrome/browser/supervised_user/chromeos/manager_password_service_facto ry.h"
6 6
7 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" 7 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
8 #include "chrome/browser/chromeos/login/users/user.h" 8 #include "chrome/browser/chromeos/login/users/user.h"
9 #include "chrome/browser/chromeos/login/users/user_manager.h" 9 #include "chrome/browser/chromeos/login/users/user_manager.h"
10 #include "chrome/browser/managed_mode/chromeos/manager_password_service.h"
11 #include "chrome/browser/managed_mode/managed_user_shared_settings_service_facto ry.h"
12 #include "chrome/browser/managed_mode/managed_user_sync_service_factory.h"
13 #include "chrome/browser/profiles/incognito_helpers.h" 10 #include "chrome/browser/profiles/incognito_helpers.h"
14 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/supervised_user/chromeos/manager_password_service.h"
13 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service _factory.h"
14 #include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h"
15 #include "components/keyed_service/content/browser_context_dependency_manager.h" 15 #include "components/keyed_service/content/browser_context_dependency_manager.h"
16 16
17 namespace chromeos { 17 namespace chromeos {
18 18
19 // static 19 // static
20 ManagerPasswordService* 20 ManagerPasswordService*
21 ManagerPasswordServiceFactory::GetForProfile(Profile* profile) { 21 ManagerPasswordServiceFactory::GetForProfile(Profile* profile) {
22 return static_cast<ManagerPasswordService*>( 22 return static_cast<ManagerPasswordService*>(
23 GetInstance()->GetServiceForBrowserContext(profile, true)); 23 GetInstance()->GetServiceForBrowserContext(profile, true));
24 } 24 }
25 25
26 // static 26 // static
27 ManagerPasswordServiceFactory* 27 ManagerPasswordServiceFactory*
28 ManagerPasswordServiceFactory::GetInstance() { 28 ManagerPasswordServiceFactory::GetInstance() {
29 return Singleton<ManagerPasswordServiceFactory>::get(); 29 return Singleton<ManagerPasswordServiceFactory>::get();
30 } 30 }
31 31
32 ManagerPasswordServiceFactory::ManagerPasswordServiceFactory() 32 ManagerPasswordServiceFactory::ManagerPasswordServiceFactory()
33 : BrowserContextKeyedServiceFactory( 33 : BrowserContextKeyedServiceFactory(
34 "ManagerPasswordService", 34 "ManagerPasswordService",
35 BrowserContextDependencyManager::GetInstance()) { 35 BrowserContextDependencyManager::GetInstance()) {
36 DependsOn(ManagedUserSharedSettingsServiceFactory::GetInstance()); 36 DependsOn(SupervisedUserSharedSettingsServiceFactory::GetInstance());
37 DependsOn(ManagedUserSyncServiceFactory::GetInstance()); 37 DependsOn(SupervisedUserSyncServiceFactory::GetInstance());
38 } 38 }
39 39
40 ManagerPasswordServiceFactory:: 40 ManagerPasswordServiceFactory::
41 ~ManagerPasswordServiceFactory() {} 41 ~ManagerPasswordServiceFactory() {}
42 42
43 KeyedService* ManagerPasswordServiceFactory::BuildServiceInstanceFor( 43 KeyedService* ManagerPasswordServiceFactory::BuildServiceInstanceFor(
44 content::BrowserContext* context) const { 44 content::BrowserContext* context) const {
45 Profile* profile= static_cast<Profile*>(context); 45 Profile* profile= static_cast<Profile*>(context);
46 chromeos::User* user = chromeos::UserManager::Get()-> 46 chromeos::User* user = chromeos::UserManager::Get()->
47 GetUserByProfile(profile); 47 GetUserByProfile(profile);
48 if (chromeos::UserManager::Get()->GetSupervisedUserManager()-> 48 if (chromeos::UserManager::Get()->GetSupervisedUserManager()->
49 HasSupervisedUsers(user->email())) { 49 HasSupervisedUsers(user->email())) {
50 ManagerPasswordService* result = new ManagerPasswordService(); 50 ManagerPasswordService* result = new ManagerPasswordService();
51 result->Init( 51 result->Init(
52 user->email(), 52 user->email(),
53 ManagedUserSyncServiceFactory::GetForProfile(profile), 53 SupervisedUserSyncServiceFactory::GetForProfile(profile),
54 ManagedUserSharedSettingsServiceFactory::GetForBrowserContext(profile)); 54 SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext(
55 profile));
55 return result; 56 return result;
56 } 57 }
57 return NULL; 58 return NULL;
58 } 59 }
59 60
60 content::BrowserContext* 61 content::BrowserContext*
61 ManagerPasswordServiceFactory::GetBrowserContextToUse( 62 ManagerPasswordServiceFactory::GetBrowserContextToUse(
62 content::BrowserContext* context) const { 63 content::BrowserContext* context) const {
63 return chrome::GetBrowserContextRedirectedInIncognito(context); 64 return chrome::GetBrowserContextRedirectedInIncognito(context);
64 } 65 }
65 66
66 } // namespace chromeos 67 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698