Sync starting language and input method preferences

chrome/browser/chromeos/login/session/user_session_manager.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 85 matching lines @@
     // Skip if it's already in language_codes.
     if (std::count(language_codes.begin(), language_codes.end(),
                    candidate) == 0) {
       language_codes.push_back(candidate);
     }
   }
 
   // Save the preferred languages in the user's preferences.
   StringPrefMember language_preferred_languages;
   language_preferred_languages.Init(prefs::kLanguagePreferredLanguages, prefs);
   language_preferred_languages.SetValue(JoinString(language_codes, ','));

[dzhioev (left Google), 2014/07/24 20:31:34]

Could you please replace these 3 lines with a single line:
prefs->SetString(prefs::kLanguagePreferredLanguages, JoinString(language_codes,
','))

[michaelpg, 2014/07/25 23:49:08]

Done.

+
+  // Indicate that we need to merge the synced input methods when we sync.
+  prefs->SetBoolean(prefs::kLanguageShouldMergeInputMethods, true);

[michaelpg, 2014/07/10 00:46:02]

This isn't actually new to patch#7. reitveld seems confused because the file has
been renamed.

[dzhioev (left Google), 2014/07/23 11:02:20]

Are you sure? There are no such lines on ToT.

[dzhioev (left Google), 2014/07/23 11:06:50]

Sorry, didn't notice that you were talking about patch #7. Ignore my previous
comments. 

 }
 
 #if defined(ENABLE_RLZ)
 // Flag file that disables RLZ tracking, when present.
 const base::FilePath::CharType kRLZDisabledFlagName[] =
     FILE_PATH_LITERAL(".rlz_disabled");
 
 base::FilePath GetRlzDisabledFlagPath() {
   base::FilePath homedir;
   PathService::Get(base::DIR_HOME, &homedir);
@@ skipping 634 matching lines @@
       primary_user &&
       profile == ProfileHelper::Get()->GetProfileByUser(primary_user) &&
       CertLoader::IsInitialized() &&
       base::SysInfo::IsRunningOnChromeOS()) {
     GetNSSCertDatabaseForProfile(profile,
                                  base::Bind(&OnGetNSSCertDatabaseForUser));
   }
 }
 
 }  // namespace chromeos