diff options
| author | alemate@chromium.org <alemate@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 00:27:04 +0000 |
|---|---|---|
| committer | alemate@chromium.org <alemate@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 00:27:04 +0000 |
| commit | 57815f69c8a2eb78140fd9069cd2f068fecd4760 (patch) | |
| tree | 412c0993dcbb37269f50ea0fc863cdaffa1b1ee5 | |
| parent | e681f2e556d7c48241007e53b3cdd6dde63b1ff1 (diff) | |
| download | chromium_src-57815f69c8a2eb78140fd9069cd2f068fecd4760.zip chromium_src-57815f69c8a2eb78140fd9069cd2f068fecd4760.tar.gz chromium_src-57815f69c8a2eb78140fd9069cd2f068fecd4760.tar.bz2 | |
Merge 272666 "Set AppLocale global preference on network screen."
> Set AppLocale global preference on network screen.
>
> There is no device owner during OOBE, so owner settings are not saved, but
> language setting should be stored.
>
> BUG=chrome-os-partner:27284
> TEST=none
>
> Review URL: https://codereview.chromium.org/299443018
TBR=alemate@chromium.org
Review URL: https://codereview.chromium.org/339793002
git-svn-id: svn://svn.chromium.org/chrome/branches/1985/src@277590 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc index 4881d5a..c26cef7 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc @@ -312,6 +312,12 @@ void NetworkScreenHandler::OnLanguageChangedCallback( self->ReloadLocalizedContent(); + // We still do not have device owner, so owner settings are not applied. + // But Guest session can be started before owner is created, so we need to + // save locale settings directly here. + g_browser_process->local_state()->SetString(prefs::kApplicationLocale, + self->selected_language_code_); + AccessibilityManager::Get()->OnLocaleChanged(); } |