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

Side by Side Diff: chrome/browser/chromeos/login/user_manager_impl.cc

Issue 14522013: Separate cert loading code from CertLibrary and move to src/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix browser tests Created 7 years, 7 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/chromeos/login/user_manager_impl.h" 5 #include "chrome/browser/chromeos/login/user_manager_impl.h"
6 6
7 #include <cstddef> 7 #include <cstddef>
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1090 matching lines...) Expand 10 before | Expand all | Expand 10 after
1101 void UserManagerImpl::NotifyOnLogin() { 1101 void UserManagerImpl::NotifyOnLogin() {
1102 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 1102 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
1103 NotifyActiveUserHashChanged(active_user_->username_hash()); 1103 NotifyActiveUserHashChanged(active_user_->username_hash());
1104 1104
1105 UpdateLoginState(); 1105 UpdateLoginState();
1106 content::NotificationService::current()->Notify( 1106 content::NotificationService::current()->Notify(
1107 chrome::NOTIFICATION_LOGIN_USER_CHANGED, 1107 chrome::NOTIFICATION_LOGIN_USER_CHANGED,
1108 content::Source<UserManager>(this), 1108 content::Source<UserManager>(this),
1109 content::Details<const User>(active_user_)); 1109 content::Details<const User>(active_user_));
1110 1110
1111 CrosLibrary::Get()->GetCertLibrary()->LoadKeyStore();
1112
1113 // Indicate to DeviceSettingsService that the owner key may have become 1111 // Indicate to DeviceSettingsService that the owner key may have become
1114 // available. 1112 // available.
1115 DeviceSettingsService::Get()->SetUsername(active_user_->email()); 1113 DeviceSettingsService::Get()->SetUsername(active_user_->email());
1116 } 1114 }
1117 1115
1118 void UserManagerImpl::UpdateOwnership( 1116 void UserManagerImpl::UpdateOwnership(
1119 DeviceSettingsService::OwnershipStatus status, 1117 DeviceSettingsService::OwnershipStatus status,
1120 bool is_owner) { 1118 bool is_owner) {
1121 VLOG(1) << "Current user " << (is_owner ? "is owner" : "is not owner"); 1119 VLOG(1) << "Current user " << (is_owner ? "is owner" : "is not owner");
1122 1120
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
1445 login_user_type = LoginState::LOGGED_IN_USER_LOCALLY_MANAGED; 1443 login_user_type = LoginState::LOGGED_IN_USER_LOCALLY_MANAGED;
1446 else if (active_user_->GetType() == User::USER_TYPE_KIOSK_APP) 1444 else if (active_user_->GetType() == User::USER_TYPE_KIOSK_APP)
1447 login_user_type = LoginState::LOGGED_IN_USER_KIOSK_APP; 1445 login_user_type = LoginState::LOGGED_IN_USER_KIOSK_APP;
1448 else 1446 else
1449 login_user_type = LoginState::LOGGED_IN_USER_REGULAR; 1447 login_user_type = LoginState::LOGGED_IN_USER_REGULAR;
1450 1448
1451 LoginState::Get()->SetLoggedInState(logged_in_state, login_user_type); 1449 LoginState::Get()->SetLoggedInState(logged_in_state, login_user_type);
1452 } 1450 }
1453 1451
1454 } // namespace chromeos 1452 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698