| OLD | NEW |
| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 502 CreateUserSession(user_context, has_auth_cookies); | 502 CreateUserSession(user_context, has_auth_cookies); |
| 503 | 503 |
| 504 if (!has_active_session) | 504 if (!has_active_session) |
| 505 StartCrosSession(); | 505 StartCrosSession(); |
| 506 | 506 |
| 507 if (!user_context.GetDeviceId().empty()) { | 507 if (!user_context.GetDeviceId().empty()) { |
| 508 user_manager::known_user::SetDeviceId(user_context.GetAccountId(), | 508 user_manager::known_user::SetDeviceId(user_context.GetAccountId(), |
| 509 user_context.GetDeviceId()); | 509 user_context.GetDeviceId()); |
| 510 } | 510 } |
| 511 | 511 |
| 512 chromeos::StartupUtils::SetExt4MigrationForArcAllowed(); |
| 512 arc::UpdateArcFileSystemCompatibilityPrefIfNeeded( | 513 arc::UpdateArcFileSystemCompatibilityPrefIfNeeded( |
| 513 user_context_.GetAccountId(), | 514 user_context_.GetAccountId(), |
| 514 ProfileHelper::GetProfilePathByUserIdHash(user_context_.GetUserIDHash()), | 515 ProfileHelper::GetProfilePathByUserIdHash(user_context_.GetUserIDHash()), |
| 515 base::Bind(&UserSessionManager::PrepareProfile, AsWeakPtr())); | 516 base::Bind(&UserSessionManager::PrepareProfile, AsWeakPtr())); |
| 516 } | 517 } |
| 517 | 518 |
| 518 void UserSessionManager::DelegateDeleted(UserSessionManagerDelegate* delegate) { | 519 void UserSessionManager::DelegateDeleted(UserSessionManagerDelegate* delegate) { |
| 519 if (delegate_ == delegate) | 520 if (delegate_ == delegate) |
| 520 delegate_ = nullptr; | 521 delegate_ = nullptr; |
| 521 } | 522 } |
| (...skipping 1417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1939 ->browser_policy_connector_chromeos() | 1940 ->browser_policy_connector_chromeos() |
| 1940 ->IsEnterpriseManaged()) { | 1941 ->IsEnterpriseManaged()) { |
| 1941 return false; | 1942 return false; |
| 1942 } | 1943 } |
| 1943 | 1944 |
| 1944 // Do not show end of life notification if this is a guest session | 1945 // Do not show end of life notification if this is a guest session |
| 1945 return !profile->IsGuestSession(); | 1946 return !profile->IsGuestSession(); |
| 1946 } | 1947 } |
| 1947 | 1948 |
| 1948 } // namespace chromeos | 1949 } // namespace chromeos |
| OLD | NEW |