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

Unified Diff: chrome/browser/chromeos/login/screens/network_screen.cc

Issue 1055863002: ChromeOS: switch UI language before apps are loaded. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove empty line. Created 5 years, 7 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/chromeos/login/screens/network_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/network_screen.cc b/chrome/browser/chromeos/login/screens/network_screen.cc
index 13c6afacdcfa9bc0dfacba9d388516766a1d91bd..d1a89d75714613330cdbde0f6d41666b59563d34 100644
--- a/chrome/browser/chromeos/login/screens/network_screen.cc
+++ b/chrome/browser/chromeos/login/screens/network_screen.cc
@@ -19,6 +19,7 @@
#include "chrome/browser/chromeos/login/screens/network_view.h"
#include "chrome/browser/chromeos/login/ui/input_events_blocker.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
+#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
#include "chrome/common/pref_names.h"
#include "chrome/grit/chromium_strings.h"
@@ -173,6 +174,7 @@ void NetworkScreen::DefaultNetworkChanged(const NetworkState* network) {
void NetworkScreen::InputMethodChanged(
input_method::InputMethodManager* manager,
+ Profile* /* proflie */,
bool /* show_message */) {
GetContextEditor().SetString(
kContextKeyInputMethod,
@@ -193,7 +195,8 @@ void NetworkScreen::SetApplicationLocale(const std::string& locale) {
&NetworkScreen::OnLanguageChangedCallback, weak_factory_.GetWeakPtr(),
base::Owned(new chromeos::InputEventsBlocker)));
locale_util::SwitchLanguage(locale, true /* enableLocaleKeyboardLayouts */,
- true /* login_layouts_only */, callback);
+ true /* login_layouts_only */, callback,
+ ProfileManager::GetActiveUserProfile());
}
std::string NetworkScreen::GetApplicationLocale() {
« no previous file with comments | « chrome/browser/chromeos/login/screens/network_screen.h ('k') | chrome/browser/chromeos/login/session/user_session_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698