| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/login_utils.h" | 5 #include "chrome/browser/chromeos/login/login_utils.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 882 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 893 if (std::count(language_codes.begin(), language_codes.end(), | 893 if (std::count(language_codes.begin(), language_codes.end(), |
| 894 candidate) == 0) { | 894 candidate) == 0) { |
| 895 language_codes.push_back(candidate); | 895 language_codes.push_back(candidate); |
| 896 } | 896 } |
| 897 } | 897 } |
| 898 // Save the preferred languages in the user's preferences. | 898 // Save the preferred languages in the user's preferences. |
| 899 StringPrefMember language_preferred_languages; | 899 StringPrefMember language_preferred_languages; |
| 900 language_preferred_languages.Init(prefs::kLanguagePreferredLanguages, | 900 language_preferred_languages.Init(prefs::kLanguagePreferredLanguages, |
| 901 prefs, NULL); | 901 prefs, NULL); |
| 902 language_preferred_languages.SetValue(JoinString(language_codes, ',')); | 902 language_preferred_languages.SetValue(JoinString(language_codes, ',')); |
| 903 prefs->ScheduleSavePersistentPrefs(); | |
| 904 } | 903 } |
| 905 | 904 |
| 906 scoped_refptr<Authenticator> LoginUtilsImpl::CreateAuthenticator( | 905 scoped_refptr<Authenticator> LoginUtilsImpl::CreateAuthenticator( |
| 907 LoginStatusConsumer* consumer) { | 906 LoginStatusConsumer* consumer) { |
| 908 // Screen locker needs new Authenticator instance each time. | 907 // Screen locker needs new Authenticator instance each time. |
| 909 if (ScreenLocker::default_screen_locker()) | 908 if (ScreenLocker::default_screen_locker()) |
| 910 authenticator_ = NULL; | 909 authenticator_ = NULL; |
| 911 | 910 |
| 912 // In case of non-WebUI login new instance of Authenticator is supposed | 911 // In case of non-WebUI login new instance of Authenticator is supposed |
| 913 // to be created on each call. | 912 // to be created on each call. |
| (...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1163 // Mark login host for deletion after browser starts. This | 1162 // Mark login host for deletion after browser starts. This |
| 1164 // guarantees that the message loop will be referenced by the | 1163 // guarantees that the message loop will be referenced by the |
| 1165 // browser before it is dereferenced by the login host. | 1164 // browser before it is dereferenced by the login host. |
| 1166 if (login_host) { | 1165 if (login_host) { |
| 1167 login_host->OnSessionStart(); | 1166 login_host->OnSessionStart(); |
| 1168 login_host = NULL; | 1167 login_host = NULL; |
| 1169 } | 1168 } |
| 1170 } | 1169 } |
| 1171 | 1170 |
| 1172 } // namespace chromeos | 1171 } // namespace chromeos |
| OLD | NEW |