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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
251 return homedir.Append(kRLZDisabledFlagName); | 251 return homedir.Append(kRLZDisabledFlagName); |
252 } | 252 } |
253 #endif | 253 #endif |
254 | 254 |
255 // Callback to GetNSSCertDatabaseForProfile. It starts CertLoader using the | 255 // Callback to GetNSSCertDatabaseForProfile. It starts CertLoader using the |
256 // provided NSS database. It must be called for primary user only. | 256 // provided NSS database. It must be called for primary user only. |
257 void OnGetNSSCertDatabaseForUser(net::NSSCertDatabase* database) { | 257 void OnGetNSSCertDatabaseForUser(net::NSSCertDatabase* database) { |
258 if (!CertLoader::IsInitialized()) | 258 if (!CertLoader::IsInitialized()) |
259 return; | 259 return; |
260 | 260 |
261 CertLoader::Get()->StartWithNSSDB(database); | 261 CertLoader::Get()->StartWithUserNSSDB(database); |
262 } | 262 } |
263 | 263 |
264 // Returns new CommandLine with per-user flags. | 264 // Returns new CommandLine with per-user flags. |
265 base::CommandLine CreatePerSessionCommandLine(Profile* profile) { | 265 base::CommandLine CreatePerSessionCommandLine(Profile* profile) { |
266 base::CommandLine user_flags(base::CommandLine::NO_PROGRAM); | 266 base::CommandLine user_flags(base::CommandLine::NO_PROGRAM); |
267 flags_ui::PrefServiceFlagsStorage flags_storage_(profile->GetPrefs()); | 267 flags_ui::PrefServiceFlagsStorage flags_storage_(profile->GetPrefs()); |
268 about_flags::ConvertFlagsToSwitches(&flags_storage_, &user_flags, | 268 about_flags::ConvertFlagsToSwitches(&flags_storage_, &user_flags, |
269 flags_ui::kAddSentinels); | 269 flags_ui::kAddSentinels); |
270 return user_flags; | 270 return user_flags; |
271 } | 271 } |
(...skipping 1662 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1934 ->browser_policy_connector_chromeos() | 1934 ->browser_policy_connector_chromeos() |
1935 ->IsEnterpriseManaged()) { | 1935 ->IsEnterpriseManaged()) { |
1936 return false; | 1936 return false; |
1937 } | 1937 } |
1938 | 1938 |
1939 // Do not show end of life notification if this is a guest session | 1939 // Do not show end of life notification if this is a guest session |
1940 return !profile->IsGuestSession(); | 1940 return !profile->IsGuestSession(); |
1941 } | 1941 } |
1942 | 1942 |
1943 } // namespace chromeos | 1943 } // namespace chromeos |
OLD | NEW |