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 |