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

Unified Diff: chrome/browser/profiles/profile.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: bs removed 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
« no previous file with comments | « chrome/browser/profiles/profile.h ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile.cc
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index 488ca6e72485b4bdd41b538143e1373ba3ac72f8..b0de232437bc0591637ff0a1e4feb47d9e683755 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -112,7 +112,6 @@ void Profile::RegisterUserPrefs(PrefService* prefs) {
// in user's profile for other platforms as well.
prefs->RegisterStringPref(prefs::kApplicationLocale, "");
prefs->RegisterStringPref(prefs::kApplicationLocaleBackup, "");
- prefs->RegisterStringPref(prefs::kApplicationLocaleOverride, "");
prefs->RegisterStringPref(prefs::kApplicationLocaleAccepted, "");
#endif
}
@@ -606,8 +605,7 @@ class OffTheRecordProfileImpl : public Profile,
}
#if defined(OS_CHROMEOS)
- virtual void ChangeApplicationLocale(
- const std::string& locale, bool keep_local) {
+ virtual void ChangeAppLocale(const std::string& locale, AppLocaleChangedVia) {
}
#endif // defined(OS_CHROMEOS)
« no previous file with comments | « chrome/browser/profiles/profile.h ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698