chrome/browser/profiles/profile_impl.cc - Issue 23095006: If user profile doesn't contain language setting, default to his Google account settings.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 23095006: If user profile doesn't contain language setting, default to his Google account settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix tests. Created 7 years, 3 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 c9ace166cf4ba495faf52b21a5d3df78b3253c79..a4c9ad007c8af67c762c2265167e74a3a4d07699 100644

--- a/chrome/browser/profiles/profile_impl.cc

+++ b/chrome/browser/profiles/profile_impl.cc

@@ -1068,7 +1068,9 @@ void ProfileImpl::ChangeAppLocale(

// (2) on next login we assume that synchronization is already completed

// and we may finalize initialization.

GetPrefs()->SetString(prefs::kApplicationLocaleBackup, cur_locale);

- if (!backup_locale.empty())

+ if (!new_locale.empty())

+ GetPrefs()->SetString(prefs::kApplicationLocale, new_locale);

+ else if (!backup_locale.empty())

GetPrefs()->SetString(prefs::kApplicationLocale, backup_locale);

do_update_pref = false;

}

« no previous file with comments | « chrome/browser/profiles/profile_downloader_unittest.cc ('k') | ui/base/l10n/l10n_util.h » ('j') | no next file with comments »