Sync starting language and input method preferences

chrome/browser/chromeos/login/session/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/session_manager.h"
 
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 79 matching lines @@
     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, ','));
+
+  // Indicate that we need to merge the synced input methods when we sync.
+  prefs->SetBoolean(prefs::kLanguageShouldMergeInputMethods, true);
 }
 
 #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 461 matching lines @@
   // recorded.
   RLZTracker::InitRlzFromProfileDelayed(
       profile, UserManager::Get()->IsCurrentUserNew(),
       ping_delay < 0, base::TimeDelta::FromMilliseconds(abs(ping_delay)));
   if (delegate_)
     delegate_->OnRlzInitialized();
 #endif
 }
 
 }  // namespace chromeos