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

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: fix cookies_list.js 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 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 // Transfers authentication-related data from the profile that was used for 643 // Transfers authentication-related data from the profile that was used for
644 // authentication to the user's profile. The proxy authentication state is 644 // authentication to the user's profile. The proxy authentication state is
645 // transferred unconditionally. If the user authenticated via an auth 645 // transferred unconditionally. If the user authenticated via an auth
646 // extension, authentication cookies and server bound certificates will be 646 // extension, authentication cookies and server bound certificates will be
647 // transferred as well, if the user's cookie jar is empty. If the cookie jar 647 // transferred as well, if the user's cookie jar is empty. If the cookie jar
648 // is not empty, the authentication states in the login profile and the 648 // is not empty, the authentication states in the login profile and the
649 // user's profile must be merged using /MergeSession instead. 649 // user's profile must be merged using /MergeSession instead.
650 ProfileAuthData::Transfer( 650 ProfileAuthData::Transfer(
651 authenticator_->authentication_profile(), 651 authenticator_->authentication_profile(),
652 profile, 652 profile,
653 has_auth_cookies_, // transfer_auth_cookies_and_server_bound_certs 653 has_auth_cookies_, // transfer_auth_cookies_and_channel_ids
654 base::Bind(&UserSessionManager::CompleteProfileCreateAfterAuthTransfer, 654 base::Bind(&UserSessionManager::CompleteProfileCreateAfterAuthTransfer,
655 AsWeakPtr(), 655 AsWeakPtr(),
656 profile)); 656 profile));
657 return; 657 return;
658 } 658 }
659 659
660 FinalizePrepareProfile(profile); 660 FinalizePrepareProfile(profile);
661 } 661 }
662 662
663 void UserSessionManager::CompleteProfileCreateAfterAuthTransfer( 663 void UserSessionManager::CompleteProfileCreateAfterAuthTransfer(
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
900 900
901 void UserSessionManager::NotifyPendingUserSessionsRestoreFinished() { 901 void UserSessionManager::NotifyPendingUserSessionsRestoreFinished() {
902 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 902 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
903 user_sessions_restored_ = true; 903 user_sessions_restored_ = true;
904 FOR_EACH_OBSERVER(UserSessionStateObserver, 904 FOR_EACH_OBSERVER(UserSessionStateObserver,
905 session_state_observer_list_, 905 session_state_observer_list_,
906 PendingUserSessionsRestoreFinished()); 906 PendingUserSessionsRestoreFinished());
907 } 907 }
908 908
909 } // namespace chromeos 909 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698