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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h" | 55 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h" |
56 #include "chrome/browser/chromeos/login/ui/login_display_host.h" | 56 #include "chrome/browser/chromeos/login/ui/login_display_host.h" |
57 #include "chrome/browser/chromeos/login/user_flow.h" | 57 #include "chrome/browser/chromeos/login/user_flow.h" |
58 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" | 58 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" |
59 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" | 59 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" |
60 #include "chrome/browser/chromeos/login/wizard_controller.h" | 60 #include "chrome/browser/chromeos/login/wizard_controller.h" |
61 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 61 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
62 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 62 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
63 #include "chrome/browser/chromeos/settings/cros_settings.h" | 63 #include "chrome/browser/chromeos/settings/cros_settings.h" |
64 #include "chrome/browser/chromeos/tether/tether_service.h" | 64 #include "chrome/browser/chromeos/tether/tether_service.h" |
65 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" | |
66 #include "chrome/browser/component_updater/sth_set_component_installer.h" | 65 #include "chrome/browser/component_updater/sth_set_component_installer.h" |
67 #include "chrome/browser/first_run/first_run.h" | 66 #include "chrome/browser/first_run/first_run.h" |
68 #include "chrome/browser/google/google_brand_chromeos.h" | 67 #include "chrome/browser/google/google_brand_chromeos.h" |
69 #include "chrome/browser/lifetime/application_lifetime.h" | 68 #include "chrome/browser/lifetime/application_lifetime.h" |
70 #include "chrome/browser/net/crl_set_fetcher.h" | 69 #include "chrome/browser/net/crl_set_fetcher.h" |
71 #include "chrome/browser/net/nss_context.h" | 70 #include "chrome/browser/net/nss_context.h" |
72 #include "chrome/browser/prefs/session_startup_pref.h" | 71 #include "chrome/browser/prefs/session_startup_pref.h" |
73 #include "chrome/browser/profiles/profile.h" | 72 #include "chrome/browser/profiles/profile.h" |
74 #include "chrome/browser/profiles/profile_manager.h" | 73 #include "chrome/browser/profiles/profile_manager.h" |
75 #include "chrome/browser/signin/account_tracker_service_factory.h" | 74 #include "chrome/browser/signin/account_tracker_service_factory.h" |
(...skipping 1419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1495 } | 1494 } |
1496 | 1495 |
1497 void UserSessionManager::InitializeCertificateTransparencyComponents( | 1496 void UserSessionManager::InitializeCertificateTransparencyComponents( |
1498 const user_manager::User* user) { | 1497 const user_manager::User* user) { |
1499 const std::string username_hash = user->username_hash(); | 1498 const std::string username_hash = user->username_hash(); |
1500 component_updater::ComponentUpdateService* cus = | 1499 component_updater::ComponentUpdateService* cus = |
1501 g_browser_process->component_updater(); | 1500 g_browser_process->component_updater(); |
1502 if (!username_hash.empty() && cus) { | 1501 if (!username_hash.empty() && cus) { |
1503 const base::FilePath path = | 1502 const base::FilePath path = |
1504 ProfileHelper::GetProfilePathByUserIdHash(username_hash); | 1503 ProfileHelper::GetProfilePathByUserIdHash(username_hash); |
1505 // EV whitelist. | |
1506 RegisterEVWhitelistComponent(cus, path); | |
1507 // STH set fetcher. | 1504 // STH set fetcher. |
1508 RegisterSTHSetComponent(cus, path); | 1505 RegisterSTHSetComponent(cus, path); |
1509 } | 1506 } |
1510 } | 1507 } |
1511 | 1508 |
1512 void UserSessionManager::OnRestoreActiveSessions( | 1509 void UserSessionManager::OnRestoreActiveSessions( |
1513 const SessionManagerClient::ActiveSessionsMap& sessions, | 1510 const SessionManagerClient::ActiveSessionsMap& sessions, |
1514 bool success) { | 1511 bool success) { |
1515 if (!success) { | 1512 if (!success) { |
1516 LOG(ERROR) << "Could not get list of active user sessions after crash."; | 1513 LOG(ERROR) << "Could not get list of active user sessions after crash."; |
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1963 ->browser_policy_connector_chromeos() | 1960 ->browser_policy_connector_chromeos() |
1964 ->IsEnterpriseManaged()) { | 1961 ->IsEnterpriseManaged()) { |
1965 return false; | 1962 return false; |
1966 } | 1963 } |
1967 | 1964 |
1968 // Do not show end of life notification if this is a guest session | 1965 // Do not show end of life notification if this is a guest session |
1969 return !profile->IsGuestSession(); | 1966 return !profile->IsGuestSession(); |
1970 } | 1967 } |
1971 | 1968 |
1972 } // namespace chromeos | 1969 } // namespace chromeos |
OLD | NEW |