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

Side by Side Diff: chrome/browser/chromeos/login/session/user_session_manager.cc

Issue 356713005: Rename ServerBoundCert => ChannelID to reflect the current name (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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/chromeos/login/session/user_session_manager.h" 5 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 // Transfers authentication-related data from the profile that was used for 578 // Transfers authentication-related data from the profile that was used for
579 // authentication to the user's profile. The proxy authentication state is 579 // authentication to the user's profile. The proxy authentication state is
580 // transferred unconditionally. If the user authenticated via an auth 580 // transferred unconditionally. If the user authenticated via an auth
581 // extension, authentication cookies and server bound certificates will be 581 // extension, authentication cookies and server bound certificates will be
582 // transferred as well, if the user's cookie jar is empty. If the cookie jar 582 // transferred as well, if the user's cookie jar is empty. If the cookie jar
583 // is not empty, the authentication states in the login profile and the 583 // is not empty, the authentication states in the login profile and the
584 // user's profile must be merged using /MergeSession instead. 584 // user's profile must be merged using /MergeSession instead.
585 ProfileAuthData::Transfer( 585 ProfileAuthData::Transfer(
586 authenticator_->authentication_profile(), 586 authenticator_->authentication_profile(),
587 profile, 587 profile,
588 has_auth_cookies_, // transfer_auth_cookies_and_server_bound_certs 588 has_auth_cookies_, // transfer_auth_cookies_and_channel_ids
589 base::Bind(&UserSessionManager::CompleteProfileCreateAfterAuthTransfer, 589 base::Bind(&UserSessionManager::CompleteProfileCreateAfterAuthTransfer,
590 AsWeakPtr(), 590 AsWeakPtr(),
591 profile)); 591 profile));
592 return; 592 return;
593 } 593 }
594 594
595 FinalizePrepareProfile(profile); 595 FinalizePrepareProfile(profile);
596 } 596 }
597 597
598 void UserSessionManager::CompleteProfileCreateAfterAuthTransfer( 598 void UserSessionManager::CompleteProfileCreateAfterAuthTransfer(
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 primary_user && 751 primary_user &&
752 profile == ProfileHelper::Get()->GetProfileByUser(primary_user) && 752 profile == ProfileHelper::Get()->GetProfileByUser(primary_user) &&
753 CertLoader::IsInitialized() && 753 CertLoader::IsInitialized() &&
754 base::SysInfo::IsRunningOnChromeOS()) { 754 base::SysInfo::IsRunningOnChromeOS()) {
755 GetNSSCertDatabaseForProfile(profile, 755 GetNSSCertDatabaseForProfile(profile,
756 base::Bind(&OnGetNSSCertDatabaseForUser)); 756 base::Bind(&OnGetNSSCertDatabaseForUser));
757 } 757 }
758 } 758 }
759 759
760 } // namespace chromeos 760 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698