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 <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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 input_method_ids, &candidates); | 95 input_method_ids, &candidates); |
96 for (size_t i = 0; i < candidates.size(); ++i) { | 96 for (size_t i = 0; i < candidates.size(); ++i) { |
97 const std::string& candidate = candidates[i]; | 97 const std::string& candidate = candidates[i]; |
98 // Skip if it's already in language_codes. | 98 // Skip if it's already in language_codes. |
99 if (std::count(language_codes.begin(), language_codes.end(), | 99 if (std::count(language_codes.begin(), language_codes.end(), |
100 candidate) == 0) { | 100 candidate) == 0) { |
101 language_codes.push_back(candidate); | 101 language_codes.push_back(candidate); |
102 } | 102 } |
103 } | 103 } |
104 | 104 |
105 // Save the preferred languages in the user's preferences. | 105 prefs->SetString(prefs::kLanguagePreferredLanguages, |
106 StringPrefMember language_preferred_languages; | 106 JoinString(language_codes, ',')); |
107 language_preferred_languages.Init(prefs::kLanguagePreferredLanguages, prefs); | 107 |
108 language_preferred_languages.SetValue(JoinString(language_codes, ',')); | 108 // Indicate that we need to merge the synced input methods when we sync. |
| 109 prefs->SetBoolean(prefs::kLanguageShouldMergeInputMethods, true); |
109 } | 110 } |
110 | 111 |
111 #if defined(ENABLE_RLZ) | 112 #if defined(ENABLE_RLZ) |
112 // Flag file that disables RLZ tracking, when present. | 113 // Flag file that disables RLZ tracking, when present. |
113 const base::FilePath::CharType kRLZDisabledFlagName[] = | 114 const base::FilePath::CharType kRLZDisabledFlagName[] = |
114 FILE_PATH_LITERAL(".rlz_disabled"); | 115 FILE_PATH_LITERAL(".rlz_disabled"); |
115 | 116 |
116 base::FilePath GetRlzDisabledFlagPath() { | 117 base::FilePath GetRlzDisabledFlagPath() { |
117 base::FilePath homedir; | 118 base::FilePath homedir; |
118 PathService::Get(base::DIR_HOME, &homedir); | 119 PathService::Get(base::DIR_HOME, &homedir); |
(...skipping 782 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
901 | 902 |
902 void UserSessionManager::NotifyPendingUserSessionsRestoreFinished() { | 903 void UserSessionManager::NotifyPendingUserSessionsRestoreFinished() { |
903 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); | 904 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); |
904 user_sessions_restored_ = true; | 905 user_sessions_restored_ = true; |
905 FOR_EACH_OBSERVER(UserSessionStateObserver, | 906 FOR_EACH_OBSERVER(UserSessionStateObserver, |
906 session_state_observer_list_, | 907 session_state_observer_list_, |
907 PendingUserSessionsRestoreFinished()); | 908 PendingUserSessionsRestoreFinished()); |
908 } | 909 } |
909 | 910 |
910 } // namespace chromeos | 911 } // namespace chromeos |
OLD | NEW |