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

Side by Side Diff: chrome/browser/supervised_user/chromeos/supervised_user_password_service.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/supervised_user_password_servi ce.h" 5 #include "chrome/browser/supervised_user/chromeos/supervised_user_password_servi ce.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/chromeos/login/managed/supervised_user_authentication.h " 9 #include "chrome/browser/chromeos/login/managed/supervised_user_authentication.h "
10 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" 10 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
(...skipping 13 matching lines...) Expand all
24 SupervisedUserSharedSettingsService* shared_settings_service) { 24 SupervisedUserSharedSettingsService* shared_settings_service) {
25 user_id_ = user_id; 25 user_id_ = user_id;
26 settings_service_ = shared_settings_service; 26 settings_service_ = shared_settings_service;
27 settings_service_subscription_ = settings_service_->Subscribe( 27 settings_service_subscription_ = settings_service_->Subscribe(
28 base::Bind(&SupervisedUserPasswordService::OnSharedSettingsChange, 28 base::Bind(&SupervisedUserPasswordService::OnSharedSettingsChange,
29 weak_ptr_factory_.GetWeakPtr())); 29 weak_ptr_factory_.GetWeakPtr()));
30 30
31 // Force value check in case we have missed some notification. 31 // Force value check in case we have missed some notification.
32 32
33 chromeos::SupervisedUserManager* supervised_user_manager = 33 chromeos::SupervisedUserManager* supervised_user_manager =
34 chromeos::UserManager::Get()->GetSupervisedUserManager(); 34 chromeos::GetUserManager()->GetSupervisedUserManager();
35 35
36 OnSharedSettingsChange(supervised_user_manager->GetUserSyncId(user_id), 36 OnSharedSettingsChange(supervised_user_manager->GetUserSyncId(user_id),
37 supervised_users::kChromeOSPasswordData); 37 supervised_users::kChromeOSPasswordData);
38 } 38 }
39 39
40 void SupervisedUserPasswordService::OnSharedSettingsChange( 40 void SupervisedUserPasswordService::OnSharedSettingsChange(
41 const std::string& su_id, 41 const std::string& su_id,
42 const std::string& key) { 42 const std::string& key) {
43 if (key != supervised_users::kChromeOSPasswordData) 43 if (key != supervised_users::kChromeOSPasswordData)
44 return; 44 return;
45 chromeos::SupervisedUserManager* supervised_user_manager = 45 chromeos::SupervisedUserManager* supervised_user_manager =
46 chromeos::UserManager::Get()->GetSupervisedUserManager(); 46 chromeos::GetUserManager()->GetSupervisedUserManager();
47 const chromeos::User* user = supervised_user_manager->FindBySyncId(su_id); 47 const chromeos::User* user = supervised_user_manager->FindBySyncId(su_id);
48 if (user == NULL) { 48 if (user == NULL) {
49 LOG(WARNING) << "Got notification for user not on device."; 49 LOG(WARNING) << "Got notification for user not on device.";
50 return; 50 return;
51 } 51 }
52 DCHECK(user_id_ == user->email()); 52 DCHECK(user_id_ == user->email());
53 if (user_id_ != user->email()) 53 if (user_id_ != user->email())
54 return; 54 return;
55 const base::Value* value = settings_service_->GetValue(su_id, key); 55 const base::Value* value = settings_service_->GetValue(su_id, key);
56 if (value == NULL) { 56 if (value == NULL) {
(...skipping 10 matching lines...) Expand all
67 if (!auth->NeedPasswordChange(user_id_, dict)) 67 if (!auth->NeedPasswordChange(user_id_, dict))
68 return; 68 return;
69 auth->ScheduleSupervisedPasswordChange(user_id_, dict); 69 auth->ScheduleSupervisedPasswordChange(user_id_, dict);
70 } 70 }
71 71
72 void SupervisedUserPasswordService::Shutdown() { 72 void SupervisedUserPasswordService::Shutdown() {
73 settings_service_subscription_.reset(); 73 settings_service_subscription_.reset();
74 } 74 }
75 75
76 } // namespace chromeos 76 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698