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/session_manager.h" | 5 #include "chrome/browser/chromeos/login/session/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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 if (std::count(language_codes.begin(), language_codes.end(), | 90 if (std::count(language_codes.begin(), language_codes.end(), |
91 candidate) == 0) { | 91 candidate) == 0) { |
92 language_codes.push_back(candidate); | 92 language_codes.push_back(candidate); |
93 } | 93 } |
94 } | 94 } |
95 | 95 |
96 // Save the preferred languages in the user's preferences. | 96 // Save the preferred languages in the user's preferences. |
97 StringPrefMember language_preferred_languages; | 97 StringPrefMember language_preferred_languages; |
98 language_preferred_languages.Init(prefs::kLanguagePreferredLanguages, prefs); | 98 language_preferred_languages.Init(prefs::kLanguagePreferredLanguages, prefs); |
99 language_preferred_languages.SetValue(JoinString(language_codes, ',')); | 99 language_preferred_languages.SetValue(JoinString(language_codes, ',')); |
| 100 |
| 101 // Indicate that we need to merge the synced input methods when we sync. |
| 102 prefs->SetBoolean(prefs::kLanguageShouldMergeInputMethods, true); |
100 } | 103 } |
101 | 104 |
102 #if defined(ENABLE_RLZ) | 105 #if defined(ENABLE_RLZ) |
103 // Flag file that disables RLZ tracking, when present. | 106 // Flag file that disables RLZ tracking, when present. |
104 const base::FilePath::CharType kRLZDisabledFlagName[] = | 107 const base::FilePath::CharType kRLZDisabledFlagName[] = |
105 FILE_PATH_LITERAL(".rlz_disabled"); | 108 FILE_PATH_LITERAL(".rlz_disabled"); |
106 | 109 |
107 base::FilePath GetRlzDisabledFlagPath() { | 110 base::FilePath GetRlzDisabledFlagPath() { |
108 base::FilePath homedir; | 111 base::FilePath homedir; |
109 PathService::Get(base::DIR_HOME, &homedir); | 112 PathService::Get(base::DIR_HOME, &homedir); |
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
571 // recorded. | 574 // recorded. |
572 RLZTracker::InitRlzFromProfileDelayed( | 575 RLZTracker::InitRlzFromProfileDelayed( |
573 profile, UserManager::Get()->IsCurrentUserNew(), | 576 profile, UserManager::Get()->IsCurrentUserNew(), |
574 ping_delay < 0, base::TimeDelta::FromMilliseconds(abs(ping_delay))); | 577 ping_delay < 0, base::TimeDelta::FromMilliseconds(abs(ping_delay))); |
575 if (delegate_) | 578 if (delegate_) |
576 delegate_->OnRlzInitialized(); | 579 delegate_->OnRlzInitialized(); |
577 #endif | 580 #endif |
578 } | 581 } |
579 | 582 |
580 } // namespace chromeos | 583 } // namespace chromeos |
OLD | NEW |