Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(92)

Side by Side Diff: chrome/browser/chromeos/login/login_utils.cc

Issue 312023002: Sync starting language and input method preferences (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changes in progress, probably broken... Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 752 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 if (std::count(language_codes.begin(), language_codes.end(), 763 if (std::count(language_codes.begin(), language_codes.end(),
764 candidate) == 0) { 764 candidate) == 0) {
765 language_codes.push_back(candidate); 765 language_codes.push_back(candidate);
766 } 766 }
767 } 767 }
768 // Save the preferred languages in the user's preferences. 768 // Save the preferred languages in the user's preferences.
769 StringPrefMember language_preferred_languages; 769 StringPrefMember language_preferred_languages;
770 language_preferred_languages.Init(prefs::kLanguagePreferredLanguages, 770 language_preferred_languages.Init(prefs::kLanguagePreferredLanguages,
771 prefs); 771 prefs);
772 language_preferred_languages.SetValue(JoinString(language_codes, ',')); 772 language_preferred_languages.SetValue(JoinString(language_codes, ','));
773
774 // Indicate that we need to merge the synced input methods when we sync.
775 prefs->SetBoolean(prefs::kLanguageShouldMergeInputMethods, true);
773 } 776 }
774 777
775 scoped_refptr<Authenticator> LoginUtilsImpl::CreateAuthenticator( 778 scoped_refptr<Authenticator> LoginUtilsImpl::CreateAuthenticator(
776 LoginStatusConsumer* consumer) { 779 LoginStatusConsumer* consumer) {
777 // Screen locker needs new Authenticator instance each time. 780 // Screen locker needs new Authenticator instance each time.
778 if (ScreenLocker::default_screen_locker()) { 781 if (ScreenLocker::default_screen_locker()) {
779 if (authenticator_.get()) 782 if (authenticator_.get())
780 authenticator_->SetConsumer(NULL); 783 authenticator_->SetConsumer(NULL);
781 authenticator_ = NULL; 784 authenticator_ = NULL;
782 } 785 }
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 CrosSettings* cros_settings = CrosSettings::Get(); 956 CrosSettings* cros_settings = CrosSettings::Get();
954 bool allow_new_user = false; 957 bool allow_new_user = false;
955 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user); 958 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
956 if (allow_new_user) 959 if (allow_new_user)
957 return true; 960 return true;
958 return cros_settings->FindEmailInList( 961 return cros_settings->FindEmailInList(
959 kAccountsPrefUsers, username, wildcard_match); 962 kAccountsPrefUsers, username, wildcard_match);
960 } 963 }
961 964
962 } // namespace chromeos 965 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/users/fake_user_manager.cc » ('j') | chrome/browser/chromeos/preferences.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698