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

Unified Diff: chrome/browser/profiles/profile_impl.cc

Issue 6248017: Do not use local override for language settings: always sync. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index e0d342941cbdf49c93f320fd970f1d3610e040e9..f247c86ca5a00628e33abe857df1c2bea52fb2b0 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -1366,18 +1366,12 @@ PromoCounter* ProfileImpl::GetInstantPromoCounter() {
}
#if defined(OS_CHROMEOS)
-void ProfileImpl::ChangeApplicationLocale(
- const std::string& locale, bool keep_local) {
+void ProfileImpl::ChangeApplicationLocale(const std::string& locale) {
if (locale.empty()) {
NOTREACHED();
return;
}
- if (keep_local) {
- GetPrefs()->SetString(prefs::kApplicationLocaleOverride, locale);
- } else {
- GetPrefs()->SetString(prefs::kApplicationLocale, locale);
- GetPrefs()->ClearPref(prefs::kApplicationLocaleOverride);
- }
+ GetPrefs()->SetString(prefs::kApplicationLocale, locale);
GetPrefs()->SetString(prefs::kApplicationLocaleBackup, locale);
Nikita (slow) 2011/01/25 14:35:31 Why kApplicationLocaleBackup / Accepted prefs stat
Denis Lagno 2011/01/25 15:46:43 Backup must not be cleared. Backup should be kept
GetPrefs()->ClearPref(prefs::kApplicationLocaleAccepted);
// We maintain kApplicationLocale property in both a global storage

Powered by Google App Engine
This is Rietveld 408576698