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

Side by Side Diff: chrome/browser/supervised_user/chromeos/manager_password_service_factory.cc

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 6 years, 5 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/supervised_user/chromeos/manager_password_service_facto ry.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/profiles/profile_helper.h" 9 #include "chrome/browser/chromeos/profiles/profile_helper.h"
10 #include "chrome/browser/profiles/incognito_helpers.h" 10 #include "chrome/browser/profiles/incognito_helpers.h"
(...skipping 27 matching lines...) Expand all
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 = 46 chromeos::User* user =
47 chromeos::ProfileHelper::Get()->GetUserByProfile(profile); 47 chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
48 if (chromeos::UserManager::Get()->GetSupervisedUserManager()-> 48 if (chromeos::GetUserManager()
49 HasSupervisedUsers(user->email())) { 49 ->GetSupervisedUserManager()
50 ->HasSupervisedUsers(user->email())) {
50 ManagerPasswordService* result = new ManagerPasswordService(); 51 ManagerPasswordService* result = new ManagerPasswordService();
51 result->Init( 52 result->Init(
52 user->email(), 53 user->email(),
53 SupervisedUserSyncServiceFactory::GetForProfile(profile), 54 SupervisedUserSyncServiceFactory::GetForProfile(profile),
54 SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext( 55 SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext(
55 profile)); 56 profile));
56 return result; 57 return result;
57 } 58 }
58 return NULL; 59 return NULL;
59 } 60 }
60 61
61 content::BrowserContext* 62 content::BrowserContext*
62 ManagerPasswordServiceFactory::GetBrowserContextToUse( 63 ManagerPasswordServiceFactory::GetBrowserContextToUse(
63 content::BrowserContext* context) const { 64 content::BrowserContext* context) const {
64 return chrome::GetBrowserContextRedirectedInIncognito(context); 65 return chrome::GetBrowserContextRedirectedInIncognito(context);
65 } 66 }
66 67
67 } // namespace chromeos 68 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698